From c4b4e1bc38eb7ff9fcc77af93873c1386392089e Mon Sep 17 00:00:00 2001 From: Agniva De Sarker Date: Thu, 22 Jul 2021 12:21:47 +0530 Subject: [PATCH] MM-36271: Bump major version to 6.0 (#17973) https://mattermost.atlassian.net/browse/MM-36271 ```release-note We bump the major version to 6.0 ``` --- Makefile | 32 +++--- api4/api.go | 6 +- api4/apitestlib.go | 28 ++--- api4/bleve.go | 4 +- api4/bleve_test.go | 2 +- api4/bot.go | 4 +- api4/bot_test.go | 6 +- api4/brand.go | 4 +- api4/brand_test.go | 2 +- api4/channel.go | 8 +- api4/channel_category.go | 6 +- api4/channel_category_test.go | 2 +- api4/channel_local.go | 6 +- api4/channel_test.go | 10 +- api4/cloud.go | 4 +- api4/cluster.go | 2 +- api4/cluster_test.go | 2 +- api4/command.go | 4 +- api4/command_help_test.go | 2 +- api4/command_local.go | 4 +- api4/command_test.go | 2 +- api4/commands_test.go | 4 +- api4/compliance.go | 4 +- api4/config.go | 10 +- api4/config_local.go | 8 +- api4/config_test.go | 6 +- api4/cors_test.go | 4 +- api4/data_retention.go | 4 +- api4/elasticsearch.go | 4 +- api4/elasticsearch_test.go | 2 +- api4/emoji.go | 8 +- api4/emoji_test.go | 8 +- api4/export.go | 4 +- api4/export_test.go | 4 +- api4/file.go | 8 +- api4/file_test.go | 8 +- api4/group.go | 4 +- api4/group_test.go | 2 +- api4/handlers.go | 2 +- api4/handlers_test.go | 2 +- api4/image.go | 2 +- api4/image_test.go | 2 +- api4/import.go | 2 +- api4/import_test.go | 4 +- api4/integration_action.go | 2 +- api4/integration_action_test.go | 2 +- api4/job.go | 6 +- api4/job_test.go | 2 +- api4/ldap.go | 4 +- api4/ldap_test.go | 6 +- api4/license.go | 6 +- api4/license_local.go | 4 +- api4/license_test.go | 10 +- api4/main_test.go | 4 +- api4/oauth.go | 4 +- api4/oauth_test.go | 2 +- api4/openGraph.go | 4 +- api4/openGraph_test.go | 2 +- api4/permission.go | 2 +- api4/permissions_test.go | 2 +- api4/plugin.go | 8 +- api4/plugin_test.go | 8 +- api4/post.go | 8 +- api4/post_test.go | 12 +- api4/preference.go | 4 +- api4/preference_test.go | 2 +- api4/reaction.go | 2 +- api4/reaction_test.go | 2 +- api4/remote_cluster.go | 6 +- api4/role.go | 4 +- api4/role_test.go | 2 +- api4/saml.go | 4 +- api4/saml_test.go | 4 +- api4/scheme.go | 4 +- api4/scheme_test.go | 2 +- api4/shared_channel.go | 2 +- api4/shared_channel_test.go | 4 +- api4/status.go | 2 +- api4/status_test.go | 2 +- api4/system.go | 10 +- api4/system_local.go | 4 +- api4/system_test.go | 4 +- api4/team.go | 4 +- api4/team_local.go | 8 +- api4/team_test.go | 10 +- api4/terms_of_service.go | 6 +- api4/terms_of_service_test.go | 2 +- api4/upload.go | 4 +- api4/upload_test.go | 4 +- api4/user.go | 12 +- api4/user_local.go | 6 +- api4/user_test.go | 12 +- api4/user_viewmembers_test.go | 2 +- api4/webhook.go | 4 +- api4/webhook_local.go | 4 +- api4/webhook_test.go | 2 +- api4/websocket.go | 6 +- api4/websocket_norace_test.go | 2 +- api4/websocket_test.go | 2 +- app/admin.go | 10 +- app/analytics.go | 4 +- app/app.go | 24 ++-- app/app_iface.go | 28 ++--- app/app_test.go | 4 +- app/audit.go | 10 +- app/authentication.go | 8 +- app/authentication_test.go | 2 +- app/authorization.go | 4 +- app/authorization_test.go | 6 +- app/auto_responder.go | 4 +- app/auto_responder_test.go | 2 +- app/bot.go | 12 +- app/bot_test.go | 4 +- app/brand.go | 2 +- app/busy.go | 4 +- app/busy_test.go | 4 +- app/channel.go | 16 +-- app/channel_category.go | 6 +- app/channel_category_test.go | 2 +- app/channel_test.go | 6 +- app/cloud.go | 6 +- app/cluster.go | 2 +- app/cluster_discovery.go | 4 +- app/cluster_discovery_test.go | 2 +- app/cluster_handlers.go | 6 +- app/command.go | 10 +- app/command_autocomplete.go | 6 +- app/command_autocomplete_test.go | 6 +- app/compliance.go | 4 +- app/config.go | 10 +- app/config_test.go | 6 +- app/context.go | 6 +- app/data_retention.go | 2 +- app/download.go | 4 +- app/download_test.go | 2 +- app/email/email.go | 10 +- app/email/email_batching.go | 6 +- app/email/email_batching_test.go | 2 +- app/email/email_test.go | 4 +- app/email/helper_test.go | 20 ++-- app/email/main_test.go | 4 +- app/email/notification_email.go | 6 +- app/email/service.go | 8 +- app/email/utils.go | 4 +- app/email_test.go | 2 +- app/emoji.go | 8 +- app/enterprise.go | 12 +- app/enterprise_test.go | 8 +- app/expirynotify.go | 6 +- app/expirynotify_test.go | 2 +- app/export.go | 6 +- app/export_converters.go | 2 +- app/export_test.go | 6 +- app/extract_plugin_tar.go | 2 +- app/feature_flags.go | 4 +- app/featureflag/feature_flags_sync.go | 4 +- app/featureflag/feature_flags_sync_test.go | 2 +- app/featureflag/split_logger.go | 2 +- app/file.go | 18 +-- app/file_bench_test.go | 4 +- app/file_test.go | 8 +- app/group.go | 4 +- app/group_test.go | 2 +- app/helper_test.go | 22 ++-- app/image.go | 2 +- app/imaging/decode_bench_test.go | 2 +- app/imaging/decode_test.go | 2 +- app/imaging/utils_test.go | 2 +- app/import.go | 6 +- app/import_functions.go | 12 +- app/import_functions_test.go | 6 +- app/import_test.go | 6 +- app/import_types.go | 2 +- app/import_validators.go | 2 +- app/import_validators_test.go | 4 +- app/integration_action.go | 12 +- app/integration_action_test.go | 12 +- app/job.go | 4 +- app/job_test.go | 4 +- app/ldap.go | 6 +- app/license.go | 8 +- app/license_test.go | 2 +- app/login.go | 12 +- app/login_test.go | 2 +- app/main_test.go | 4 +- app/migrations.go | 6 +- app/notification.go | 10 +- app/notification_email.go | 6 +- app/notification_email_test.go | 8 +- app/notification_push.go | 8 +- app/notification_push_test.go | 10 +- app/notification_test.go | 6 +- app/oauth.go | 16 +-- app/oauth_test.go | 2 +- app/opengraph.go | 2 +- app/opentracing/opentracing_layer.go | 32 +++--- app/options.go | 8 +- app/permissions.go | 2 +- app/permissions_migrations.go | 4 +- app/permissions_migrations_test.go | 2 +- app/permissions_test.go | 2 +- app/plugin.go | 14 +-- app/plugin_api.go | 8 +- app/plugin_api_test.go | 30 ++--- .../manual.test_http_hijack_plugin/main.go | 2 +- .../main.go | 4 +- .../main.go | 6 +- .../main.go | 6 +- app/plugin_api_tests/test_bots_plugin/main.go | 6 +- .../test_call_log_api_plugin/main.go | 4 +- app/plugin_api_tests/test_db_driver/main.go | 12 +- .../test_get_bundle_path_plugin/main.go | 6 +- .../main.go | 6 +- .../test_get_direct_channel_plugin/main.go | 6 +- .../test_get_plugin_status_plugin/main.go | 6 +- .../test_get_profile_image_plugin/main.go | 6 +- .../test_member_channels_plugin/main.go | 6 +- .../test_members_plugin/main.go | 6 +- .../test_search_channels_plugin/main.go | 6 +- .../test_search_posts_in_team_plugin/main.go | 6 +- .../test_search_teams_plugin/main.go | 6 +- .../test_send_mail_plugin/main.go | 8 +- .../test_set_profile_image_plugin/main.go | 6 +- .../test_update_user_active_plugin/main.go | 6 +- .../test_update_user_status_plugin/main.go | 6 +- app/plugin_commands.go | 4 +- app/plugin_commands_test.go | 24 ++-- app/plugin_db_driver.go | 4 +- app/plugin_deadlock_test.go | 18 +-- app/plugin_event.go | 2 +- app/plugin_health_check_test.go | 8 +- app/plugin_hooks_test.go | 106 +++++++++--------- app/plugin_install.go | 8 +- app/plugin_install_test.go | 4 +- app/plugin_key_value_store.go | 6 +- app/plugin_requests.go | 8 +- app/plugin_requests_test.go | 4 +- app/plugin_shutdown_test.go | 4 +- app/plugin_signature.go | 6 +- app/plugin_signature_test.go | 6 +- app/plugin_statuses.go | 2 +- app/plugin_test.go | 14 +-- app/post.go | 16 +-- app/post_metadata.go | 10 +- app/post_metadata_test.go | 8 +- app/post_test.go | 26 ++--- app/preference.go | 2 +- app/product_notices.go | 12 +- app/product_notices_test.go | 6 +- app/ratelimit.go | 8 +- app/ratelimit_test.go | 2 +- app/reaction.go | 6 +- app/reaction_test.go | 4 +- app/remote_cluster.go | 6 +- app/remote_cluster_service_mock.go | 4 +- app/remote_cluster_test.go | 4 +- app/request/context.go | 4 +- app/role.go | 6 +- app/role_test.go | 4 +- app/saml.go | 2 +- app/scheme.go | 4 +- app/searchengine.go | 4 +- app/security_update_check.go | 8 +- app/server.go | 70 ++++++------ app/server_license.go | 2 +- app/server_test.go | 12 +- app/session.go | 10 +- app/session_test.go | 2 +- app/shared_channel.go | 4 +- app/shared_channel_notifier.go | 6 +- app/shared_channel_notifier_test.go | 2 +- app/shared_channel_service_iface.go | 4 +- app/shared_channel_test.go | 2 +- app/slack.go | 8 +- app/slack_test.go | 2 +- app/slashcommands/auto_channels.go | 8 +- app/slashcommands/auto_constants.go | 4 +- app/slashcommands/auto_environment.go | 8 +- app/slashcommands/auto_posts.go | 10 +- app/slashcommands/auto_teams.go | 4 +- app/slashcommands/auto_users.go | 10 +- app/slashcommands/command_away.go | 8 +- app/slashcommands/command_channel_header.go | 8 +- .../command_channel_header_test.go | 2 +- app/slashcommands/command_channel_purpose.go | 8 +- .../command_channel_purpose_test.go | 2 +- app/slashcommands/command_channel_rename.go | 8 +- .../command_channel_rename_test.go | 2 +- app/slashcommands/command_code.go | 8 +- app/slashcommands/command_code_test.go | 2 +- app/slashcommands/command_custom_status.go | 10 +- .../command_custom_status_test.go | 2 +- app/slashcommands/command_dnd.go | 8 +- app/slashcommands/command_echo.go | 10 +- app/slashcommands/command_expand_collapse.go | 8 +- app/slashcommands/command_groupmsg.go | 10 +- app/slashcommands/command_groupmsg_test.go | 4 +- app/slashcommands/command_help.go | 8 +- app/slashcommands/command_invite.go | 10 +- app/slashcommands/command_invite_people.go | 10 +- .../command_invite_people_test.go | 2 +- app/slashcommands/command_invite_test.go | 4 +- app/slashcommands/command_join.go | 8 +- app/slashcommands/command_join_test.go | 4 +- app/slashcommands/command_leave.go | 8 +- app/slashcommands/command_leave_test.go | 2 +- app/slashcommands/command_loadtest.go | 12 +- app/slashcommands/command_logout.go | 8 +- app/slashcommands/command_me.go | 8 +- app/slashcommands/command_me_test.go | 2 +- app/slashcommands/command_msg.go | 12 +- app/slashcommands/command_msg_test.go | 4 +- app/slashcommands/command_mute.go | 8 +- app/slashcommands/command_mute_test.go | 4 +- app/slashcommands/command_offline.go | 8 +- app/slashcommands/command_online.go | 8 +- app/slashcommands/command_open.go | 6 +- app/slashcommands/command_remote.go | 8 +- app/slashcommands/command_remove.go | 10 +- app/slashcommands/command_remove_test.go | 2 +- app/slashcommands/command_search.go | 8 +- app/slashcommands/command_settings.go | 8 +- app/slashcommands/command_share.go | 8 +- app/slashcommands/command_share_test.go | 8 +- app/slashcommands/command_shortcuts.go | 8 +- app/slashcommands/command_shrug.go | 8 +- app/slashcommands/command_test.go | 4 +- app/slashcommands/helper_test.go | 16 +-- app/slashcommands/main_test.go | 4 +- app/slashcommands/util.go | 4 +- app/status.go | 6 +- app/status_test.go | 2 +- app/syncables.go | 6 +- app/syncables_test.go | 2 +- app/team.go | 20 ++-- app/team_test.go | 4 +- app/terms_of_service.go | 4 +- app/upload.go | 10 +- app/upload_test.go | 4 +- app/user.go | 22 ++-- app/user_terms_of_service.go | 4 +- app/user_test.go | 14 +-- app/user_viewmembers_test.go | 4 +- app/web_conn.go | 6 +- app/web_conn_test.go | 4 +- app/web_hub.go | 4 +- app/web_hub_test.go | 8 +- app/webhook.go | 10 +- app/webhook_test.go | 4 +- app/webhub_fuzz.go | 8 +- app/websocket_router.go | 6 +- audit/audit.go | 2 +- cmd/mattermost/commands/channel.go | 8 +- cmd/mattermost/commands/channel_test.go | 2 +- cmd/mattermost/commands/channelargs.go | 4 +- cmd/mattermost/commands/cmdtestlib.go | 8 +- cmd/mattermost/commands/command.go | 6 +- cmd/mattermost/commands/command_test.go | 2 +- cmd/mattermost/commands/commandargs.go | 4 +- cmd/mattermost/commands/config.go | 12 +- cmd/mattermost/commands/config_test.go | 4 +- cmd/mattermost/commands/db.go | 4 +- cmd/mattermost/commands/export.go | 6 +- cmd/mattermost/commands/export_test.go | 2 +- cmd/mattermost/commands/extract_content.go | 4 +- cmd/mattermost/commands/group.go | 4 +- cmd/mattermost/commands/group_test.go | 2 +- cmd/mattermost/commands/import.go | 4 +- cmd/mattermost/commands/init.go | 12 +- cmd/mattermost/commands/integrity.go | 2 +- cmd/mattermost/commands/jobserver.go | 6 +- cmd/mattermost/commands/ldap.go | 4 +- cmd/mattermost/commands/license.go | 2 +- cmd/mattermost/commands/logs.go | 2 +- cmd/mattermost/commands/main_test.go | 6 +- cmd/mattermost/commands/permissions.go | 4 +- cmd/mattermost/commands/permissions_test.go | 2 +- cmd/mattermost/commands/plugin.go | 4 +- cmd/mattermost/commands/plugin_test.go | 4 +- cmd/mattermost/commands/reset.go | 2 +- cmd/mattermost/commands/roles.go | 4 +- cmd/mattermost/commands/sampledata.go | 10 +- cmd/mattermost/commands/server.go | 16 +-- cmd/mattermost/commands/server_test.go | 4 +- cmd/mattermost/commands/team.go | 8 +- cmd/mattermost/commands/team_test.go | 2 +- cmd/mattermost/commands/teamargs.go | 4 +- cmd/mattermost/commands/test.go | 8 +- cmd/mattermost/commands/user.go | 10 +- cmd/mattermost/commands/user_test.go | 2 +- cmd/mattermost/commands/userargs.go | 4 +- cmd/mattermost/commands/utils.go | 4 +- cmd/mattermost/commands/version.go | 4 +- cmd/mattermost/commands/webhook.go | 6 +- cmd/mattermost/commands/webhook_test.go | 4 +- cmd/mattermost/main.go | 8 +- config/client.go | 2 +- config/client_test.go | 2 +- config/common_test.go | 2 +- config/database.go | 4 +- config/database_test.go | 2 +- config/diff.go | 2 +- config/diff_test.go | 2 +- config/emitter.go | 4 +- config/emitter_test.go | 4 +- config/environment.go | 2 +- config/environment_test.go | 2 +- config/file.go | 6 +- config/file_test.go | 4 +- config/logging.go | 2 +- config/main_test.go | 6 +- config/memory.go | 2 +- config/migrate_test.go | 2 +- config/store.go | 4 +- config/utils.go | 8 +- config/utils_test.go | 4 +- config/watcher.go | 2 +- einterfaces/account_migration.go | 2 +- einterfaces/cloud.go | 2 +- einterfaces/cluster.go | 2 +- einterfaces/compliance.go | 2 +- einterfaces/data_retention.go | 2 +- einterfaces/jobs/cloud_interface.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/jobs/resend_invitation_email.go | 2 +- einterfaces/ldap.go | 4 +- einterfaces/license.go | 2 +- einterfaces/message_export.go | 2 +- einterfaces/metrics.go | 2 +- einterfaces/mfa.go | 2 +- .../mocks/AccountMigrationInterface.go | 2 +- einterfaces/mocks/AppContextInterface.go | 2 +- einterfaces/mocks/CloudInterface.go | 2 +- einterfaces/mocks/CloudJobInterface.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/LdapInterface.go | 4 +- einterfaces/mocks/LdapSyncInterface.go | 2 +- einterfaces/mocks/LicenseInterface.go | 2 +- einterfaces/mocks/MessageExportInterface.go | 2 +- .../mocks/MessageExportJobInterface.go | 2 +- einterfaces/mocks/MetricsInterface.go | 2 +- einterfaces/mocks/MfaInterface.go | 2 +- einterfaces/mocks/NotificationInterface.go | 2 +- einterfaces/mocks/OAuthProvider.go | 2 +- .../ResendInvitationEmailJobInterface.go | 2 +- einterfaces/mocks/SamlInterface.go | 4 +- einterfaces/notification.go | 2 +- einterfaces/oauthproviders.go | 2 +- einterfaces/saml.go | 4 +- go.mod | 2 +- go.sum | 1 - go.tools.mod | 2 +- imports/placeholder.go | 22 ++-- jobs/active_users/scheduler.go | 4 +- jobs/active_users/worker.go | 10 +- jobs/expirynotify/expirynotify.go | 4 +- jobs/expirynotify/scheduler.go | 4 +- jobs/expirynotify/worker.go | 8 +- jobs/export_delete/scheduler.go | 4 +- jobs/export_delete/worker.go | 10 +- jobs/export_process/worker.go | 10 +- jobs/import_delete/scheduler.go | 4 +- jobs/import_delete/worker.go | 12 +- jobs/import_process/worker.go | 12 +- jobs/interfaces/active_users_interface.go | 2 +- jobs/interfaces/expirynotify_interface.go | 2 +- jobs/interfaces/export_delete_interface.go | 2 +- jobs/interfaces/export_process_interface.go | 2 +- jobs/interfaces/import_delete_interface.go | 2 +- jobs/interfaces/import_process_interface.go | 2 +- jobs/interfaces/indexer_interface.go | 2 +- jobs/interfaces/migrations_interface.go | 2 +- jobs/interfaces/plugins_interface.go | 2 +- jobs/interfaces/product_notices_interface.go | 2 +- jobs/jobs.go | 6 +- jobs/jobs_test.go | 10 +- jobs/jobs_watcher.go | 4 +- jobs/product_notices/product_notices.go | 4 +- jobs/product_notices/scheduler.go | 4 +- jobs/product_notices/worker.go | 8 +- .../resend_invitation_email.go | 4 +- jobs/resend_invitation_email/scheduler.go | 4 +- jobs/resend_invitation_email/worker.go | 6 +- jobs/schedulers.go | 4 +- jobs/schedulers_test.go | 10 +- jobs/server.go | 12 +- jobs/workers.go | 6 +- manualtesting/manual_testing.go | 16 +-- manualtesting/test_autolink.go | 4 +- migrations/advanced_permissions_phase_2.go | 2 +- migrations/helper_test.go | 12 +- migrations/main_test.go | 4 +- migrations/migrations.go | 8 +- migrations/migrations_test.go | 2 +- migrations/scheduler.go | 6 +- migrations/worker.go | 8 +- model/bundle_info.go | 2 +- model/client4_test.go | 2 +- model/command_args.go | 2 +- model/command_response.go | 2 +- model/config.go | 4 +- model/gitlab/gitlab.go | 4 +- model/post.go | 2 +- model/session.go | 2 +- model/user.go | 4 +- model/utils.go | 2 +- model/websocket_request.go | 2 +- plugin/api.go | 2 +- plugin/api_timer_layer_generated.go | 4 +- 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 | 8 +- plugin/environment_test.go | 2 +- 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_config.go | 4 +- plugin/helpers_config_test.go | 6 +- plugin/helpers_kv_test.go | 6 +- plugin/helpers_plugin.go | 2 +- plugin/helpers_plugin_test.go | 10 +- plugin/hooks.go | 2 +- plugin/hooks_timer_layer_generated.go | 4 +- plugin/http.go | 2 +- plugin/interface_generator/main.go | 10 +- plugin/plugintest/api.go | 2 +- plugin/plugintest/doc.go | 2 +- plugin/plugintest/driver.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 | 6 +- plugin/supervisor_test.go | 6 +- scripts/config_generator/main.go | 2 +- scripts/config_generator/main_test.go | 2 +- services/awsmeter/awsmeter.go | 6 +- services/awsmeter/awsmeter_test.go | 6 +- services/cache/cache.go | 2 +- services/cache/lru.go | 2 +- services/cache/lru_striped.go | 2 +- services/cache/lru_striped_bench_test.go | 2 +- services/cache/lru_striped_test.go | 2 +- services/cache/lru_test.go | 2 +- services/cache/mocks/Provider.go | 2 +- services/cache/provider.go | 2 +- services/cache/provider_test.go | 2 +- services/configservice/configservice.go | 2 +- services/docextractor/combine.go | 2 +- services/docextractor/docextractor_test.go | 2 +- services/docextractor/pdf_test.go | 2 +- services/httpservice/httpservice.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/marketplace/client.go | 4 +- services/remotecluster/invitation.go | 2 +- services/remotecluster/mocks_test.go | 12 +- services/remotecluster/ping.go | 4 +- services/remotecluster/ping_test.go | 2 +- services/remotecluster/recv.go | 4 +- services/remotecluster/send_test.go | 2 +- services/remotecluster/sendfile.go | 6 +- services/remotecluster/sendmsg.go | 4 +- services/remotecluster/sendprofileImage.go | 4 +- .../remotecluster/sendprofileImage_test.go | 2 +- services/remotecluster/service.go | 8 +- services/remotecluster/service_test.go | 2 +- services/searchengine/bleveengine/bleve.go | 6 +- .../searchengine/bleveengine/bleve_test.go | 14 +-- services/searchengine/bleveengine/common.go | 4 +- .../bleveengine/indexer/indexing_job.go | 12 +- .../bleveengine/indexer/indexing_job_test.go | 10 +- services/searchengine/bleveengine/search.go | 4 +- services/searchengine/bleveengine/testlib.go | 2 +- services/searchengine/interface.go | 2 +- .../mocks/SearchEngineInterface.go | 2 +- services/searchengine/searchengine.go | 4 +- services/searchengine/utils.go | 2 +- services/sharedchannel/attachment.go | 6 +- services/sharedchannel/channelinvite.go | 8 +- services/sharedchannel/channelinvite_test.go | 8 +- services/sharedchannel/mock_AppIface_test.go | 6 +- .../sharedchannel/mock_ServerIface_test.go | 8 +- services/sharedchannel/msg.go | 2 +- services/sharedchannel/permalink.go | 6 +- services/sharedchannel/permalink_test.go | 8 +- services/sharedchannel/service.go | 12 +- services/sharedchannel/sync_recv.go | 8 +- services/sharedchannel/sync_send.go | 8 +- services/sharedchannel/sync_send_remote.go | 6 +- services/sharedchannel/util.go | 2 +- services/slackimport/converters.go | 2 +- services/slackimport/main_test.go | 2 +- services/slackimport/parsers.go | 4 +- services/slackimport/slackimport.go | 10 +- services/slackimport/slackimport_test.go | 4 +- services/telemetry/mocks/ServerIface.go | 6 +- services/telemetry/telemetry.go | 16 +-- services/telemetry/telemetry_test.go | 16 +-- services/tracing/tracing.go | 2 +- services/upgrader/upgrader_linux.go | 4 +- services/upgrader/upgrader_linux_test.go | 2 +- services/users/helper_test.go | 10 +- services/users/main_test.go | 4 +- services/users/password.go | 2 +- services/users/password_test.go | 2 +- services/users/profile_picture.go | 6 +- services/users/service.go | 8 +- services/users/service_test.go | 2 +- services/users/session.go | 6 +- services/users/session_test.go | 2 +- services/users/users.go | 10 +- services/users/utils.go | 2 +- shared/driver/conn.go | 2 +- shared/driver/driver.go | 2 +- shared/driver/objects.go | 2 +- shared/filestore/filesstore_test.go | 2 +- shared/filestore/localstore.go | 2 +- shared/filestore/mocks/FileBackend.go | 2 +- shared/filestore/s3store.go | 2 +- shared/i18n/i18n.go | 2 +- shared/mail/mail.go | 2 +- shared/mfa/mfa_test.go | 4 +- shared/mlog/global_test.go | 2 +- shared/mlog/human/entry.go | 2 +- shared/mlog/human/parser.go | 2 +- shared/mlog/log_test.go | 2 +- shared/templates/templates.go | 2 +- .../opentracing_layer.go.tmpl | 6 +- store/layer_generators/retry_layer.go.tmpl | 4 +- store/layer_generators/timer_layer.go.tmpl | 6 +- store/localcachelayer/channel_layer.go | 4 +- store/localcachelayer/channel_layer_test.go | 6 +- store/localcachelayer/emoji_layer.go | 6 +- store/localcachelayer/emoji_layer_test.go | 6 +- store/localcachelayer/file_info_layer.go | 4 +- store/localcachelayer/file_info_layer_test.go | 6 +- store/localcachelayer/layer.go | 8 +- store/localcachelayer/layer_test.go | 8 +- store/localcachelayer/main_test.go | 16 +-- 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/team_layer.go | 4 +- store/localcachelayer/team_layer_test.go | 4 +- .../localcachelayer/terms_of_service_layer.go | 4 +- .../terms_of_service_layer_test.go | 6 +- store/localcachelayer/user_layer.go | 6 +- store/localcachelayer/user_layer_test.go | 10 +- store/localcachelayer/webhook_layer.go | 4 +- store/localcachelayer/webhook_layer_test.go | 6 +- store/opentracinglayer/opentracinglayer.go | 6 +- store/retrylayer/retrylayer.go | 4 +- store/retrylayer/retrylayer_test.go | 4 +- store/searchlayer/channel_layer.go | 8 +- store/searchlayer/file_info_layer.go | 8 +- store/searchlayer/layer.go | 8 +- store/searchlayer/layer_test.go | 12 +- store/searchlayer/post_layer.go | 8 +- store/searchlayer/team_layer.go | 4 +- store/searchlayer/user_layer.go | 8 +- store/searchtest/channel_layer.go | 4 +- store/searchtest/file_info_layer.go | 4 +- store/searchtest/helper.go | 4 +- store/searchtest/post_layer.go | 4 +- store/searchtest/testlib.go | 4 +- store/searchtest/user_layer.go | 4 +- 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_categories.go | 4 +- .../sqlstore/channel_store_categories_test.go | 2 +- store/sqlstore/channel_store_test.go | 8 +- 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 | 4 +- 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 | 6 +- 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 | 12 +- store/sqlstore/post_store_test.go | 4 +- store/sqlstore/preference_store.go | 6 +- store/sqlstore/preference_store_test.go | 6 +- store/sqlstore/product_notices_store.go | 4 +- store/sqlstore/product_notices_store_test.go | 2 +- store/sqlstore/reaction_store.go | 6 +- store/sqlstore/reaction_store_test.go | 2 +- store/sqlstore/remote_cluster_store.go | 4 +- store/sqlstore/remote_cluster_store_test.go | 2 +- store/sqlstore/retention_policy_store.go | 6 +- store/sqlstore/retention_policy_store_test.go | 2 +- store/sqlstore/role_store.go | 4 +- store/sqlstore/role_store_test.go | 2 +- store/sqlstore/scheme_store.go | 4 +- store/sqlstore/scheme_store_test.go | 2 +- store/sqlstore/session_store.go | 6 +- store/sqlstore/session_store_test.go | 2 +- store/sqlstore/shared_channel_store.go | 4 +- store/sqlstore/shared_channel_store_test.go | 2 +- store/sqlstore/status_store.go | 4 +- store/sqlstore/status_store_test.go | 2 +- store/sqlstore/store.go | 14 +-- store/sqlstore/store_test.go | 10 +- store/sqlstore/system_store.go | 6 +- store/sqlstore/system_store_test.go | 2 +- store/sqlstore/team_store.go | 6 +- store/sqlstore/team_store_test.go | 4 +- store/sqlstore/terms_of_service_store.go | 6 +- store/sqlstore/terms_of_service_store_test.go | 2 +- store/sqlstore/thread_store.go | 6 +- store/sqlstore/thread_store_test.go | 2 +- store/sqlstore/tokens_store.go | 6 +- store/sqlstore/upgrade.go | 6 +- store/sqlstore/upgrade_test.go | 4 +- store/sqlstore/upload_session_store.go | 4 +- store/sqlstore/upload_session_store_test.go | 2 +- store/sqlstore/user_access_token_store.go | 4 +- .../sqlstore/user_access_token_store_test.go | 2 +- store/sqlstore/user_store.go | 6 +- store/sqlstore/user_store_test.go | 4 +- 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 | 8 +- store/storetest/channel_store_categories.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 | 6 +- 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/ProductNoticesStore.go | 2 +- store/storetest/mocks/ReactionStore.go | 2 +- store/storetest/mocks/RemoteClusterStore.go | 2 +- store/storetest/mocks/RetentionPolicyStore.go | 2 +- store/storetest/mocks/RoleStore.go | 2 +- store/storetest/mocks/SchemeStore.go | 2 +- store/storetest/mocks/SessionStore.go | 2 +- store/storetest/mocks/SharedChannelStore.go | 2 +- store/storetest/mocks/StatusStore.go | 2 +- store/storetest/mocks/Store.go | 4 +- store/storetest/mocks/SystemStore.go | 2 +- store/storetest/mocks/TeamStore.go | 2 +- store/storetest/mocks/TermsOfServiceStore.go | 2 +- store/storetest/mocks/ThreadStore.go | 4 +- store/storetest/mocks/TokenStore.go | 2 +- store/storetest/mocks/UploadSessionStore.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/product_notices_store.go | 4 +- store/storetest/reaction_store.go | 6 +- store/storetest/remote_cluster_store.go | 4 +- store/storetest/retention_policy_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/shared_channel_store.go | 4 +- store/storetest/status_store.go | 4 +- store/storetest/store.go | 6 +- 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/thread_store.go | 4 +- store/storetest/upload_session_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/utils.go | 2 +- store/storetest/webhook_store.go | 4 +- store/timerlayer/timerlayer.go | 6 +- testlib/cluster.go | 4 +- testlib/helper.go | 16 +-- testlib/resources.go | 8 +- testlib/store.go | 8 +- utils/api.go | 4 +- utils/api_test.go | 2 +- utils/archive_test.go | 2 +- utils/authorization.go | 2 +- utils/authorization_test.go | 2 +- utils/i18n.go | 4 +- utils/imgutils/gif_test.go | 2 +- utils/jsonutils/json_test.go | 2 +- utils/license.go | 6 +- utils/logger.go | 6 +- utils/merge_test.go | 2 +- utils/mocks/LicenseValidatorIface.go | 2 +- utils/subpath.go | 6 +- utils/subpath_test.go | 4 +- utils/testutils/static_config_service.go | 2 +- utils/testutils/testutils.go | 4 +- utils/utils.go | 2 +- web/context.go | 14 +-- web/context_test.go | 8 +- web/handlers.go | 18 +-- web/handlers_test.go | 8 +- web/main_test.go | 4 +- web/oauth.go | 14 +-- web/oauth_test.go | 12 +- web/params.go | 2 +- web/saml.go | 8 +- web/static.go | 10 +- web/unsupported_browser.go | 4 +- web/web.go | 8 +- web/web_test.go | 22 ++-- 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 +- 899 files changed, 2383 insertions(+), 2384 deletions(-) diff --git a/Makefile b/Makefile index 33be5abe64..24d1dec360 100644 --- a/Makefile +++ b/Makefile @@ -74,11 +74,11 @@ GOFLAGS ?= $(GOFLAGS:) export GOBIN ?= $(PWD)/bin GO=go DELVE=dlv -LDFLAGS += -X "github.com/mattermost/mattermost-server/v5/model.BuildNumber=$(BUILD_NUMBER)" -LDFLAGS += -X "github.com/mattermost/mattermost-server/v5/model.BuildDate=$(BUILD_DATE)" -LDFLAGS += -X "github.com/mattermost/mattermost-server/v5/model.BuildHash=$(BUILD_HASH)" -LDFLAGS += -X "github.com/mattermost/mattermost-server/v5/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)" -LDFLAGS += -X "github.com/mattermost/mattermost-server/v5/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)" +LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildNumber=$(BUILD_NUMBER)" +LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildDate=$(BUILD_DATE)" +LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildHash=$(BUILD_HASH)" +LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)" +LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)" GO_MAJOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1) GO_MINOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f2) @@ -147,7 +147,7 @@ all: run ## Alias for 'run'. include config.mk include build/*.mk -LDFLAGS += -X "github.com/mattermost/mattermost-server/v5/model.MockCWS=$(MM_ENABLE_CWS_MOCK)" +LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.MockCWS=$(MM_ENABLE_CWS_MOCK)" RUN_IN_BACKGROUND ?= ifeq ($(RUN_SERVER_IN_BACKGROUND),true) @@ -460,20 +460,20 @@ run-server: prepackaged-binaries validate-go-version start-docker ## Starts the debug-server: start-docker ## Compile and start server using delve. mkdir -p $(BUILD_WEBAPP_DIR)/dist/files $(DELVE) debug $(PLATFORM_FILES) --build-flags="-ldflags '\ - -X github.com/mattermost/mattermost-server/v5/model.BuildNumber=$(BUILD_NUMBER)\ - -X \"github.com/mattermost/mattermost-server/v5/model.BuildDate=$(BUILD_DATE)\"\ - -X github.com/mattermost/mattermost-server/v5/model.BuildHash=$(BUILD_HASH)\ - -X github.com/mattermost/mattermost-server/v5/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\ - -X github.com/mattermost/mattermost-server/v5/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'" + -X github.com/mattermost/mattermost-server/v6/model.BuildNumber=$(BUILD_NUMBER)\ + -X \"github.com/mattermost/mattermost-server/v6/model.BuildDate=$(BUILD_DATE)\"\ + -X github.com/mattermost/mattermost-server/v6/model.BuildHash=$(BUILD_HASH)\ + -X github.com/mattermost/mattermost-server/v6/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\ + -X github.com/mattermost/mattermost-server/v6/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'" debug-server-headless: start-docker ## Debug server from within an IDE like VSCode or IntelliJ. mkdir -p $(BUILD_WEBAPP_DIR)/dist/files $(DELVE) debug --headless --listen=:2345 --api-version=2 --accept-multiclient $(PLATFORM_FILES) --build-flags="-ldflags '\ - -X github.com/mattermost/mattermost-server/v5/model.BuildNumber=$(BUILD_NUMBER)\ - -X \"github.com/mattermost/mattermost-server/v5/model.BuildDate=$(BUILD_DATE)\"\ - -X github.com/mattermost/mattermost-server/v5/model.BuildHash=$(BUILD_HASH)\ - -X github.com/mattermost/mattermost-server/v5/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\ - -X github.com/mattermost/mattermost-server/v5/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'" + -X github.com/mattermost/mattermost-server/v6/model.BuildNumber=$(BUILD_NUMBER)\ + -X \"github.com/mattermost/mattermost-server/v6/model.BuildDate=$(BUILD_DATE)\"\ + -X github.com/mattermost/mattermost-server/v6/model.BuildHash=$(BUILD_HASH)\ + -X github.com/mattermost/mattermost-server/v6/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\ + -X github.com/mattermost/mattermost-server/v6/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'" run-cli: start-docker ## Runs CLI. @echo Running mattermost for development diff --git a/api4/api.go b/api4/api.go index 16d4d34f53..24dd41a389 100644 --- a/api4/api.go +++ b/api4/api.go @@ -9,9 +9,9 @@ import ( "github.com/gorilla/mux" _ "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/web" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/web" ) type Routes struct { diff --git a/api4/apitestlib.go b/api4/apitestlib.go index 8f87184c8a..62e356b4a3 100644 --- a/api4/apitestlib.go +++ b/api4/apitestlib.go @@ -21,20 +21,20 @@ import ( "github.com/minio/minio-go/v7/pkg/credentials" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/config" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v5/services/searchengine" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" - "github.com/mattermost/mattermost-server/v5/store/localcachelayer" - "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v5/testlib" - "github.com/mattermost/mattermost-server/v5/utils" - "github.com/mattermost/mattermost-server/v5/web" - "github.com/mattermost/mattermost-server/v5/wsapi" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/config" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/v6/services/searchengine" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/store/localcachelayer" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v6/testlib" + "github.com/mattermost/mattermost-server/v6/utils" + "github.com/mattermost/mattermost-server/v6/web" + "github.com/mattermost/mattermost-server/v6/wsapi" ) type TestHelper struct { diff --git a/api4/bleve.go b/api4/bleve.go index 6d5ba56ca4..7f560a70e6 100644 --- a/api4/bleve.go +++ b/api4/bleve.go @@ -6,8 +6,8 @@ package api4 import ( "net/http" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitBleve() { diff --git a/api4/bleve_test.go b/api4/bleve_test.go index d72bc2de54..a7c63a2958 100644 --- a/api4/bleve_test.go +++ b/api4/bleve_test.go @@ -6,7 +6,7 @@ package api4 import ( "testing" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestBlevePurgeIndexes(t *testing.T) { diff --git a/api4/bot.go b/api4/bot.go index 812ab6c89a..4688965411 100644 --- a/api4/bot.go +++ b/api4/bot.go @@ -11,8 +11,8 @@ import ( "net/http" "strconv" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitBot() { diff --git a/api4/bot_test.go b/api4/bot_test.go index 1d2624a6bb..0b4a5f9ed4 100644 --- a/api4/bot_test.go +++ b/api4/bot_test.go @@ -15,9 +15,9 @@ import ( "github.com/stretchr/testify/require" - "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/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/utils/testutils" ) func TestCreateBot(t *testing.T) { diff --git a/api4/brand.go b/api4/brand.go index a3d53bfe07..744170f1e6 100644 --- a/api4/brand.go +++ b/api4/brand.go @@ -8,8 +8,8 @@ import ( "io/ioutil" "net/http" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitBrand() { diff --git a/api4/brand_test.go b/api4/brand_test.go index 596ed1d924..e2e9e048a9 100644 --- a/api4/brand_test.go +++ b/api4/brand_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/utils/testutils" + "github.com/mattermost/mattermost-server/v6/utils/testutils" ) func TestGetBrandImage(t *testing.T) { diff --git a/api4/channel.go b/api4/channel.go index 8dcdeb2b28..b0448d0ea8 100644 --- a/api4/channel.go +++ b/api4/channel.go @@ -10,10 +10,10 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) func (api *API) InitChannel() { diff --git a/api4/channel_category.go b/api4/channel_category.go index 57977da5a0..9e043ce827 100644 --- a/api4/channel_category.go +++ b/api4/channel_category.go @@ -6,9 +6,9 @@ package api4 import ( "net/http" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) func getCategoriesForTeamForUser(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/api4/channel_category_test.go b/api4/channel_category_test.go index 9e83c10f35..d6f3a8ed0a 100644 --- a/api4/channel_category_test.go +++ b/api4/channel_category_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestCreateCategoryForTeamForUser(t *testing.T) { diff --git a/api4/channel_local.go b/api4/channel_local.go index 15bd565791..c85e7645bb 100644 --- a/api4/channel_local.go +++ b/api4/channel_local.go @@ -6,9 +6,9 @@ package api4 import ( "net/http" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitChannelLocal() { diff --git a/api4/channel_test.go b/api4/channel_test.go index 0c128c738a..a1d3df30d2 100644 --- a/api4/channel_test.go +++ b/api4/channel_test.go @@ -17,11 +17,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/app" - "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" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v6/utils" ) func TestCreateChannel(t *testing.T) { diff --git a/api4/cloud.go b/api4/cloud.go index c064342d98..0ea3c20d8a 100644 --- a/api4/cloud.go +++ b/api4/cloud.go @@ -12,8 +12,8 @@ import ( "net/http" "time" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitCloud() { diff --git a/api4/cluster.go b/api4/cluster.go index d41d6f2416..44b7788acb 100644 --- a/api4/cluster.go +++ b/api4/cluster.go @@ -6,7 +6,7 @@ package api4 import ( "net/http" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitCluster() { diff --git a/api4/cluster_test.go b/api4/cluster_test.go index 5e1fa95d98..8a9181f572 100644 --- a/api4/cluster_test.go +++ b/api4/cluster_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestGetClusterStatus(t *testing.T) { diff --git a/api4/command.go b/api4/command.go index 2a8fa852d9..78837fc58a 100644 --- a/api4/command.go +++ b/api4/command.go @@ -8,8 +8,8 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitCommand() { diff --git a/api4/command_help_test.go b/api4/command_help_test.go index 888185c292..00d3baaa7c 100644 --- a/api4/command_help_test.go +++ b/api4/command_help_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestHelpCommand(t *testing.T) { diff --git a/api4/command_local.go b/api4/command_local.go index 3666f9a327..5e2ae5d3f0 100644 --- a/api4/command_local.go +++ b/api4/command_local.go @@ -6,8 +6,8 @@ package api4 import ( "net/http" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitCommandLocal() { diff --git a/api4/command_test.go b/api4/command_test.go index 63e3843257..886ac110ed 100644 --- a/api4/command_test.go +++ b/api4/command_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestCreateCommand(t *testing.T) { diff --git a/api4/commands_test.go b/api4/commands_test.go index c47bbae235..6ab3f692d4 100644 --- a/api4/commands_test.go +++ b/api4/commands_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - _ "github.com/mattermost/mattermost-server/v5/app/slashcommands" + _ "github.com/mattermost/mattermost-server/v6/app/slashcommands" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestEchoCommand(t *testing.T) { diff --git a/api4/compliance.go b/api4/compliance.go index 04a7536014..8aaa74c9b7 100644 --- a/api4/compliance.go +++ b/api4/compliance.go @@ -9,8 +9,8 @@ import ( "github.com/avct/uasurfer" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitCompliance() { diff --git a/api4/config.go b/api4/config.go index 59596b7d53..ed17d48f62 100644 --- a/api4/config.go +++ b/api4/config.go @@ -9,11 +9,11 @@ import ( "reflect" "strings" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/config" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/config" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/utils" ) var writeFilter func(c *Context, structField reflect.StructField) bool diff --git a/api4/config_local.go b/api4/config_local.go index 45a2eeb524..1d4de69718 100644 --- a/api4/config_local.go +++ b/api4/config_local.go @@ -7,10 +7,10 @@ import ( "net/http" "reflect" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/config" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/config" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/utils" ) func (api *API) InitConfigLocal() { diff --git a/api4/config_test.go b/api4/config_test.go index 1e3d876b6e..1c1aa997ee 100644 --- a/api4/config_test.go +++ b/api4/config_test.go @@ -15,9 +15,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "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/v6/app" + "github.com/mattermost/mattermost-server/v6/config" + "github.com/mattermost/mattermost-server/v6/model" ) func TestGetConfig(t *testing.T) { diff --git a/api4/cors_test.go b/api4/cors_test.go index 1ab4802262..c4578a4ca9 100644 --- a/api4/cors_test.go +++ b/api4/cors_test.go @@ -11,8 +11,8 @@ import ( "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/mocks" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) const ( diff --git a/api4/data_retention.go b/api4/data_retention.go index 9bcbd12d4b..a207cb5540 100644 --- a/api4/data_retention.go +++ b/api4/data_retention.go @@ -7,8 +7,8 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitDataRetention() { diff --git a/api4/elasticsearch.go b/api4/elasticsearch.go index 8ec20adb7c..c77e2ed4e2 100644 --- a/api4/elasticsearch.go +++ b/api4/elasticsearch.go @@ -6,8 +6,8 @@ package api4 import ( "net/http" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitElasticsearch() { diff --git a/api4/elasticsearch_test.go b/api4/elasticsearch_test.go index 1671c5c406..4c55a8990b 100644 --- a/api4/elasticsearch_test.go +++ b/api4/elasticsearch_test.go @@ -6,7 +6,7 @@ package api4 import ( "testing" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestElasticsearchTest(t *testing.T) { diff --git a/api4/emoji.go b/api4/emoji.go index 59de0ac269..58ca61813d 100644 --- a/api4/emoji.go +++ b/api4/emoji.go @@ -9,10 +9,10 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/web" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/web" ) const ( diff --git a/api4/emoji_test.go b/api4/emoji_test.go index f4313016e4..45d3bfe5df 100644 --- a/api4/emoji_test.go +++ b/api4/emoji_test.go @@ -14,10 +14,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "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/fileutils" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/utils" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) func TestCreateEmoji(t *testing.T) { diff --git a/api4/export.go b/api4/export.go index 69438d5182..3b1e6f212c 100644 --- a/api4/export.go +++ b/api4/export.go @@ -9,8 +9,8 @@ import ( "path/filepath" "time" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitExport() { diff --git a/api4/export_test.go b/api4/export_test.go index 11d7355935..48e060ef6c 100644 --- a/api4/export_test.go +++ b/api4/export_test.go @@ -11,8 +11,8 @@ import ( "path/filepath" "testing" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" "github.com/stretchr/testify/require" ) diff --git a/api4/file.go b/api4/file.go index 762c214e62..c06a8e2836 100644 --- a/api4/file.go +++ b/api4/file.go @@ -15,10 +15,10 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/utils" ) const ( diff --git a/api4/file_test.go b/api4/file_test.go index f57ca494e4..2a4a05596a 100644 --- a/api4/file_test.go +++ b/api4/file_test.go @@ -22,10 +22,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "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/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/utils/testutils" ) var testDir = "" diff --git a/api4/group.go b/api4/group.go index 046cd1eb9e..a8773bf689 100644 --- a/api4/group.go +++ b/api4/group.go @@ -11,8 +11,8 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitGroup() { diff --git a/api4/group_test.go b/api4/group_test.go index 4188772b67..dab3ad49aa 100644 --- a/api4/group_test.go +++ b/api4/group_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestGetGroup(t *testing.T) { diff --git a/api4/handlers.go b/api4/handlers.go index ff4e19d472..60d453c80a 100644 --- a/api4/handlers.go +++ b/api4/handlers.go @@ -8,7 +8,7 @@ import ( "github.com/mattermost/gziphandler" - "github.com/mattermost/mattermost-server/v5/web" + "github.com/mattermost/mattermost-server/v6/web" ) type Context = web.Context diff --git a/api4/handlers_test.go b/api4/handlers_test.go index b654e7d591..b30dab112d 100644 --- a/api4/handlers_test.go +++ b/api4/handlers_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func handlerForGzip(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/api4/image.go b/api4/image.go index 9022724b2a..10491d59ba 100644 --- a/api4/image.go +++ b/api4/image.go @@ -7,7 +7,7 @@ import ( "net/http" "net/url" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitImage() { diff --git a/api4/image_test.go b/api4/image_test.go index be25414139..d1518c3891 100644 --- a/api4/image_test.go +++ b/api4/image_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestGetImage(t *testing.T) { diff --git a/api4/import.go b/api4/import.go index 48363d79ce..5b64279316 100644 --- a/api4/import.go +++ b/api4/import.go @@ -7,7 +7,7 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitImport() { diff --git a/api4/import_test.go b/api4/import_test.go index 7531182077..8811f91d39 100644 --- a/api4/import_test.go +++ b/api4/import_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) func TestListImports(t *testing.T) { diff --git a/api4/integration_action.go b/api4/integration_action.go index e0e2992b9b..b3b6480dc1 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/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitAction() { diff --git a/api4/integration_action_test.go b/api4/integration_action_test.go index 01dc582ed4..eca8c8a955 100644 --- a/api4/integration_action_test.go +++ b/api4/integration_action_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type testHandler struct { diff --git a/api4/job.go b/api4/job.go index cf2e25d5b9..b457c0589e 100644 --- a/api4/job.go +++ b/api4/job.go @@ -9,9 +9,9 @@ import ( "strconv" "time" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) func (api *API) InitJob() { diff --git a/api4/job_test.go b/api4/job_test.go index dd46448db4..546f2b45bc 100644 --- a/api4/job_test.go +++ b/api4/job_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestCreateJob(t *testing.T) { diff --git a/api4/ldap.go b/api4/ldap.go index 7c8137b9a6..9d02c9d8a1 100644 --- a/api4/ldap.go +++ b/api4/ldap.go @@ -8,8 +8,8 @@ import ( "mime/multipart" "net/http" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) type mixedUnlinkedGroup struct { diff --git a/api4/ldap_test.go b/api4/ldap_test.go index 73b54d893e..8aec812fbc 100644 --- a/api4/ldap_test.go +++ b/api4/ldap_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" - "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/v6/einterfaces/mocks" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" ) var spPrivateKey = `-----BEGIN PRIVATE KEY----- diff --git a/api4/license.go b/api4/license.go index b16d640c01..8d11668472 100644 --- a/api4/license.go +++ b/api4/license.go @@ -11,10 +11,10 @@ import ( "io/ioutil" "net/http" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/utils" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitLicense() { diff --git a/api4/license_local.go b/api4/license_local.go index 624bb0a9fa..dc143b240f 100644 --- a/api4/license_local.go +++ b/api4/license_local.go @@ -8,8 +8,8 @@ import ( "io" "net/http" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitLicenseLocal() { diff --git a/api4/license_test.go b/api4/license_test.go index 4708f90d9d..0ab371ce68 100644 --- a/api4/license_test.go +++ b/api4/license_test.go @@ -9,14 +9,14 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/v5/einterfaces/mocks" - "github.com/mattermost/mattermost-server/v5/utils" - mocks2 "github.com/mattermost/mattermost-server/v5/utils/mocks" - "github.com/mattermost/mattermost-server/v5/utils/testutils" + "github.com/mattermost/mattermost-server/v6/einterfaces/mocks" + "github.com/mattermost/mattermost-server/v6/utils" + mocks2 "github.com/mattermost/mattermost-server/v6/utils/mocks" + "github.com/mattermost/mattermost-server/v6/utils/testutils" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestGetOldClientLicense(t *testing.T) { diff --git a/api4/main_test.go b/api4/main_test.go index 8970384cc2..90862a5886 100644 --- a/api4/main_test.go +++ b/api4/main_test.go @@ -7,8 +7,8 @@ import ( "flag" "testing" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/testlib" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/testlib" ) var replicaFlag bool diff --git a/api4/oauth.go b/api4/oauth.go index 5717cce553..2dcfb8f19f 100644 --- a/api4/oauth.go +++ b/api4/oauth.go @@ -6,8 +6,8 @@ package api4 import ( "net/http" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitOAuth() { diff --git a/api4/oauth_test.go b/api4/oauth_test.go index cdd301131e..52fd1934c9 100644 --- a/api4/oauth_test.go +++ b/api4/oauth_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestCreateOAuthApp(t *testing.T) { diff --git a/api4/openGraph.go b/api4/openGraph.go index 3215d7014a..d9e47baa43 100644 --- a/api4/openGraph.go +++ b/api4/openGraph.go @@ -7,8 +7,8 @@ import ( "net/http" "time" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/cache" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/cache" ) const OpenGraphMetadataCacheSize = 10000 diff --git a/api4/openGraph_test.go b/api4/openGraph_test.go index 78216e871f..c21ffccc7c 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/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestGetOpenGraphMetadata(t *testing.T) { diff --git a/api4/permission.go b/api4/permission.go index d37a9abae2..59b89edf3a 100644 --- a/api4/permission.go +++ b/api4/permission.go @@ -8,7 +8,7 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitPermissions() { diff --git a/api4/permissions_test.go b/api4/permissions_test.go index 0de01b93c5..a6f5107f1c 100644 --- a/api4/permissions_test.go +++ b/api4/permissions_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestGetAncillaryPermissions(t *testing.T) { diff --git a/api4/plugin.go b/api4/plugin.go index 98027c80db..d21313b09f 100644 --- a/api4/plugin.go +++ b/api4/plugin.go @@ -13,10 +13,10 @@ import ( "net/url" "strconv" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" "github.com/pkg/errors" ) diff --git a/api4/plugin_test.go b/api4/plugin_test.go index cb97f30324..ccdceb0487 100644 --- a/api4/plugin_test.go +++ b/api4/plugin_test.go @@ -22,10 +22,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/testlib" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/testlib" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) func TestPlugin(t *testing.T) { diff --git a/api4/post.go b/api4/post.go index 5e8b332ce0..686e5f6e86 100644 --- a/api4/post.go +++ b/api4/post.go @@ -9,10 +9,10 @@ import ( "strconv" "time" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) func (api *API) InitPost() { diff --git a/api4/post_test.go b/api4/post_test.go index f210290e05..ade544d8c6 100644 --- a/api4/post_test.go +++ b/api4/post_test.go @@ -21,12 +21,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/app" - "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" - "github.com/mattermost/mattermost-server/v5/utils/testutils" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v6/utils" + "github.com/mattermost/mattermost-server/v6/utils/testutils" ) func TestCreatePost(t *testing.T) { diff --git a/api4/preference.go b/api4/preference.go index b29991283e..9dc75a9b36 100644 --- a/api4/preference.go +++ b/api4/preference.go @@ -6,8 +6,8 @@ package api4 import ( "net/http" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitPreference() { diff --git a/api4/preference_test.go b/api4/preference_test.go index 36015cb0a5..5e92c0e3fc 100644 --- a/api4/preference_test.go +++ b/api4/preference_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestGetPreferences(t *testing.T) { diff --git a/api4/reaction.go b/api4/reaction.go index 83a02ca3ce..0c751ce528 100644 --- a/api4/reaction.go +++ b/api4/reaction.go @@ -6,7 +6,7 @@ package api4 import ( "net/http" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitReaction() { diff --git a/api4/reaction_test.go b/api4/reaction_test.go index 211e990dbc..c74a20d81d 100644 --- a/api4/reaction_test.go +++ b/api4/reaction_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestSaveReaction(t *testing.T) { diff --git a/api4/remote_cluster.go b/api4/remote_cluster.go index 0b667e60b4..86ea8d7fc9 100644 --- a/api4/remote_cluster.go +++ b/api4/remote_cluster.go @@ -10,9 +10,9 @@ import ( "net/http" "time" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/remotecluster" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/remotecluster" ) func (api *API) InitRemoteCluster() { diff --git a/api4/role.go b/api4/role.go index 85e83342f9..d6bff0066b 100644 --- a/api4/role.go +++ b/api4/role.go @@ -6,8 +6,8 @@ package api4 import ( "net/http" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) var notAllowedPermissions = []string{ diff --git a/api4/role_test.go b/api4/role_test.go index 4215f6f5a7..2a85316c02 100644 --- a/api4/role_test.go +++ b/api4/role_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestGetRole(t *testing.T) { diff --git a/api4/saml.go b/api4/saml.go index 13003dbb80..21b81a002e 100644 --- a/api4/saml.go +++ b/api4/saml.go @@ -10,8 +10,8 @@ import ( "mime/multipart" "net/http" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitSaml() { diff --git a/api4/saml_test.go b/api4/saml_test.go index 09e32c80c3..97cbfdb137 100644 --- a/api4/saml_test.go +++ b/api4/saml_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/einterfaces/mocks" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/einterfaces/mocks" + "github.com/mattermost/mattermost-server/v6/model" ) func TestGetSamlMetadata(t *testing.T) { diff --git a/api4/scheme.go b/api4/scheme.go index 041c979e63..1813b1b574 100644 --- a/api4/scheme.go +++ b/api4/scheme.go @@ -6,8 +6,8 @@ package api4 import ( "net/http" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitScheme() { diff --git a/api4/scheme_test.go b/api4/scheme_test.go index 41ff16ed13..481b7a2a87 100644 --- a/api4/scheme_test.go +++ b/api4/scheme_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestCreateScheme(t *testing.T) { diff --git a/api4/shared_channel.go b/api4/shared_channel.go index 306144355d..b98a4016b6 100644 --- a/api4/shared_channel.go +++ b/api4/shared_channel.go @@ -7,7 +7,7 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitSharedChannels() { diff --git a/api4/shared_channel_test.go b/api4/shared_channel_test.go index 0a590e39a1..a1bd069a8a 100644 --- a/api4/shared_channel_test.go +++ b/api4/shared_channel_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/model" ) var ( diff --git a/api4/status.go b/api4/status.go index d4172f2f58..8ae5765964 100644 --- a/api4/status.go +++ b/api4/status.go @@ -6,7 +6,7 @@ package api4 import ( "net/http" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitStatus() { diff --git a/api4/status_test.go b/api4/status_test.go index ed645f7e84..b9362441d2 100644 --- a/api4/status_test.go +++ b/api4/status_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestGetUserStatus(t *testing.T) { diff --git a/api4/system.go b/api4/system.go index 3dbd2c8f91..96957dd445 100644 --- a/api4/system.go +++ b/api4/system.go @@ -17,11 +17,11 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/cache" - "github.com/mattermost/mattermost-server/v5/services/upgrader" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/cache" + "github.com/mattermost/mattermost-server/v6/services/upgrader" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const ( diff --git a/api4/system_local.go b/api4/system_local.go index 3a6ff47714..796d0318be 100644 --- a/api4/system_local.go +++ b/api4/system_local.go @@ -7,8 +7,8 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitSystemLocal() { diff --git a/api4/system_test.go b/api4/system_test.go index 178e32653a..6463a65131 100644 --- a/api4/system_test.go +++ b/api4/system_test.go @@ -17,8 +17,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) func TestGetPing(t *testing.T) { diff --git a/api4/team.go b/api4/team.go index aea6c5f687..44ea08501f 100644 --- a/api4/team.go +++ b/api4/team.go @@ -15,8 +15,8 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) const ( diff --git a/api4/team_local.go b/api4/team_local.go index 18a070542f..3c30e75dd3 100644 --- a/api4/team_local.go +++ b/api4/team_local.go @@ -10,10 +10,10 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/app/email" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/app/email" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func (api *API) InitTeamLocal() { diff --git a/api4/team_test.go b/api4/team_test.go index a6673164d8..60e097c9df 100644 --- a/api4/team_test.go +++ b/api4/team_test.go @@ -15,11 +15,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mail" - "github.com/mattermost/mattermost-server/v5/utils/testutils" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mail" + "github.com/mattermost/mattermost-server/v6/utils/testutils" ) func TestCreateTeam(t *testing.T) { diff --git a/api4/terms_of_service.go b/api4/terms_of_service.go index bdf219fc3e..7e739bc0e5 100644 --- a/api4/terms_of_service.go +++ b/api4/terms_of_service.go @@ -6,9 +6,9 @@ package api4 import ( "net/http" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitTermsOfService() { diff --git a/api4/terms_of_service_test.go b/api4/terms_of_service_test.go index fdca2c8e7b..3fb2446985 100644 --- a/api4/terms_of_service_test.go +++ b/api4/terms_of_service_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestGetTermsOfService(t *testing.T) { diff --git a/api4/upload.go b/api4/upload.go index 73b711c3f9..59aa9df669 100644 --- a/api4/upload.go +++ b/api4/upload.go @@ -9,8 +9,8 @@ import ( "mime/multipart" "net/http" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitUpload() { diff --git a/api4/upload_test.go b/api4/upload_test.go index a8ffb180f4..dc20eb19ba 100644 --- a/api4/upload_test.go +++ b/api4/upload_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) func TestCreateUpload(t *testing.T) { diff --git a/api4/user.go b/api4/user.go index 7ce35f9f03..ada60ce39e 100644 --- a/api4/user.go +++ b/api4/user.go @@ -13,12 +13,12 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/utils" ) func (api *API) InitUser() { diff --git a/api4/user_local.go b/api4/user_local.go index bdd19e65a6..3c2a5de14b 100644 --- a/api4/user_local.go +++ b/api4/user_local.go @@ -7,9 +7,9 @@ import ( "net/http" "strconv" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func (api *API) InitUserLocal() { diff --git a/api4/user_test.go b/api4/user_test.go index dfff41765e..49c53edc01 100644 --- a/api4/user_test.go +++ b/api4/user_test.go @@ -17,13 +17,13 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/einterfaces/mocks" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mail" - "github.com/mattermost/mattermost-server/v5/utils/testutils" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/einterfaces/mocks" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mail" + "github.com/mattermost/mattermost-server/v6/utils/testutils" - _ "github.com/mattermost/mattermost-server/v5/model/gitlab" + _ "github.com/mattermost/mattermost-server/v6/model/gitlab" ) func TestCreateUser(t *testing.T) { diff --git a/api4/user_viewmembers_test.go b/api4/user_viewmembers_test.go index cc050368f0..d59e4945c7 100644 --- a/api4/user_viewmembers_test.go +++ b/api4/user_viewmembers_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestApiResctrictedViewMembers(t *testing.T) { diff --git a/api4/webhook.go b/api4/webhook.go index 503a372bbe..a0e32cb3e6 100644 --- a/api4/webhook.go +++ b/api4/webhook.go @@ -6,8 +6,8 @@ package api4 import ( "net/http" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitWebhook() { diff --git a/api4/webhook_local.go b/api4/webhook_local.go index aa4db45aea..302344ca37 100644 --- a/api4/webhook_local.go +++ b/api4/webhook_local.go @@ -6,8 +6,8 @@ package api4 import ( "net/http" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitWebhookLocal() { diff --git a/api4/webhook_test.go b/api4/webhook_test.go index 0468b2a2b0..6df356f51e 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/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestCreateIncomingWebhook(t *testing.T) { diff --git a/api4/websocket.go b/api4/websocket.go index 62d3e45802..b0f5a5a763 100644 --- a/api4/websocket.go +++ b/api4/websocket.go @@ -8,9 +8,9 @@ import ( "github.com/gorilla/websocket" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const ( diff --git a/api4/websocket_norace_test.go b/api4/websocket_norace_test.go index a2b28b35a9..46e6bc843c 100644 --- a/api4/websocket_norace_test.go +++ b/api4/websocket_norace_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) // TestWebSocket is intentionally made to skip -race mode diff --git a/api4/websocket_test.go b/api4/websocket_test.go index 9249f587ea..45ca02fba0 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/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestWebSocketTrailingSlash(t *testing.T) { diff --git a/app/admin.go b/app/admin.go index 56fc9dcbcf..e0dc72ab71 100644 --- a/app/admin.go +++ b/app/admin.go @@ -13,11 +13,11 @@ import ( "runtime/debug" "time" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mail" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mail" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/utils" ) func (s *Server) GetLogs(page, perPage int) ([]string, *model.AppError) { diff --git a/app/analytics.go b/app/analytics.go index 26bfefba10..747a7b80c8 100644 --- a/app/analytics.go +++ b/app/analytics.go @@ -8,8 +8,8 @@ import ( "golang.org/x/sync/errgroup" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const ( diff --git a/app/app.go b/app/app.go index b4ece04d8a..7e476a2f2d 100644 --- a/app/app.go +++ b/app/app.go @@ -10,18 +10,18 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/einterfaces" - "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/searchengine" - "github.com/mattermost/mattermost-server/v5/services/timezones" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mail" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/shared/templates" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/httpservice" + "github.com/mattermost/mattermost-server/v6/services/imageproxy" + "github.com/mattermost/mattermost-server/v6/services/searchengine" + "github.com/mattermost/mattermost-server/v6/services/timezones" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mail" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/templates" + "github.com/mattermost/mattermost-server/v6/utils" ) type App struct { diff --git a/app/app_iface.go b/app/app_iface.go index a0d34b4cd4..5e87c74c01 100644 --- a/app/app_iface.go +++ b/app/app_iface.go @@ -19,20 +19,20 @@ import ( "time" "github.com/dyatlov/go-opengraph/opengraph" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/einterfaces" - "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/remotecluster" - "github.com/mattermost/mattermost-server/v5/services/searchengine" - "github.com/mattermost/mattermost-server/v5/services/timezones" - "github.com/mattermost/mattermost-server/v5/shared/filestore" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/services/httpservice" + "github.com/mattermost/mattermost-server/v6/services/imageproxy" + "github.com/mattermost/mattermost-server/v6/services/remotecluster" + "github.com/mattermost/mattermost-server/v6/services/searchengine" + "github.com/mattermost/mattermost-server/v6/services/timezones" + "github.com/mattermost/mattermost-server/v6/shared/filestore" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) // AppIface is extracted from App struct and contains all it's exported methods. It's provided to allow partial interface passing and app layers creation. diff --git a/app/app_test.go b/app/app_test.go index 81793cc512..91c1af36ef 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) /* Temporarily comment out until MM-11108 diff --git a/app/audit.go b/app/audit.go index ac0f9d5b38..845a2ee35e 100644 --- a/app/audit.go +++ b/app/audit.go @@ -11,11 +11,11 @@ import ( "github.com/hashicorp/go-multierror" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/config" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/config" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) const ( diff --git a/app/authentication.go b/app/authentication.go index 0012c5d2e4..ed4f7d3e02 100644 --- a/app/authentication.go +++ b/app/authentication.go @@ -8,10 +8,10 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/users" - "github.com/mattermost/mattermost-server/v5/shared/mfa" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/users" + "github.com/mattermost/mattermost-server/v6/shared/mfa" ) type TokenLocation int diff --git a/app/authentication_test.go b/app/authentication_test.go index cb323923d2..dd314cb9f2 100644 --- a/app/authentication_test.go +++ b/app/authentication_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestParseAuthTokenFromRequest(t *testing.T) { diff --git a/app/authorization.go b/app/authorization.go index 43ef0cb373..93e022590f 100644 --- a/app/authorization.go +++ b/app/authorization.go @@ -8,8 +8,8 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) func (a *App) MakePermissionError(s *model.Session, permissions []*model.Permission) *model.AppError { diff --git a/app/authorization_test.go b/app/authorization_test.go index a488900a4c..ba1990116c 100644 --- a/app/authorization_test.go +++ b/app/authorization_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "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/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) func TestCheckIfRolesGrantPermission(t *testing.T) { diff --git a/app/auto_responder.go b/app/auto_responder.go index 4583d26485..0b6eb5e269 100644 --- a/app/auto_responder.go +++ b/app/auto_responder.go @@ -7,8 +7,8 @@ import ( "net/http" "time" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" ) // check if there is any auto_response type post in channel by the user in a calender day diff --git a/app/auto_responder_test.go b/app/auto_responder_test.go index 41b7e298c0..6fb998200b 100644 --- a/app/auto_responder_test.go +++ b/app/auto_responder_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestSetAutoResponderStatus(t *testing.T) { diff --git a/app/bot.go b/app/bot.go index c74dcaa970..8b8625733d 100644 --- a/app/bot.go +++ b/app/bot.go @@ -11,12 +11,12 @@ import ( "mime/multipart" "net/http" - "github.com/mattermost/mattermost-server/v5/app/imaging" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/app/imaging" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) // CreateBot creates the given bot and corresponding user. diff --git a/app/bot_test.go b/app/bot_test.go index c400ff669b..65132fe77b 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/v5/model" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) func TestCreateBot(t *testing.T) { diff --git a/app/brand.go b/app/brand.go index 2895607758..df23f5b55a 100644 --- a/app/brand.go +++ b/app/brand.go @@ -9,7 +9,7 @@ import ( "net/http" "time" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) const ( diff --git a/app/busy.go b/app/busy.go index 79a9747475..7a07cc7be1 100644 --- a/app/busy.go +++ b/app/busy.go @@ -8,8 +8,8 @@ import ( "sync/atomic" "time" - "github.com/mattermost/mattermost-server/v5/einterfaces" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" ) const ( diff --git a/app/busy_test.go b/app/busy_test.go index a2c3237cf3..ce257eccc4 100644 --- a/app/busy_test.go +++ b/app/busy_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/einterfaces" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" ) func TestBusySet(t *testing.T) { diff --git a/app/channel.go b/app/channel.go index 7a6c3dccb2..72bad156dc 100644 --- a/app/channel.go +++ b/app/channel.go @@ -10,14 +10,14 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" - "github.com/mattermost/mattermost-server/v5/store/sqlstore" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/store/sqlstore" + "github.com/mattermost/mattermost-server/v6/utils" ) // CreateDefaultChannels creates channels in the given team for each channel returned by (*App).DefaultChannelNames. diff --git a/app/channel_category.go b/app/channel_category.go index a8047bbffc..0050dec661 100644 --- a/app/channel_category.go +++ b/app/channel_category.go @@ -7,9 +7,9 @@ import ( "errors" "net/http" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) func (a *App) createInitialSidebarCategories(userID, teamID string) (*model.OrderedSidebarCategories, *model.AppError) { diff --git a/app/channel_category_test.go b/app/channel_category_test.go index 94eb371ac0..a44b4e1d28 100644 --- a/app/channel_category_test.go +++ b/app/channel_category_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestSidebarCategory(t *testing.T) { diff --git a/app/channel_test.go b/app/channel_test.go index efcd9cac93..a9c836668e 100644 --- a/app/channel_test.go +++ b/app/channel_test.go @@ -17,9 +17,9 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/users" - "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/users" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) func TestPermanentDeleteChannel(t *testing.T) { diff --git a/app/cloud.go b/app/cloud.go index 2f78167398..ec9711cb10 100644 --- a/app/cloud.go +++ b/app/cloud.go @@ -8,9 +8,9 @@ import ( "net/http" "time" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) func (a *App) getSysAdminsEmailRecipients() ([]*model.User, *model.AppError) { diff --git a/app/cluster.go b/app/cluster.go index 4813dd9441..db1f926747 100644 --- a/app/cluster.go +++ b/app/cluster.go @@ -4,7 +4,7 @@ package app import ( - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/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 6a8c6a6812..45a1da609f 100644 --- a/app/cluster_discovery.go +++ b/app/cluster_discovery.go @@ -6,8 +6,8 @@ package app import ( "time" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const ( diff --git a/app/cluster_discovery_test.go b/app/cluster_discovery_test.go index 05041e4b5f..050f289c56 100644 --- a/app/cluster_discovery_test.go +++ b/app/cluster_discovery_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestClusterDiscoveryService(t *testing.T) { diff --git a/app/cluster_handlers.go b/app/cluster_handlers.go index f8138d5979..a8a33c0e11 100644 --- a/app/cluster_handlers.go +++ b/app/cluster_handlers.go @@ -6,9 +6,9 @@ package app import ( "strings" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) func (s *Server) clusterInstallPluginHandler(msg *model.ClusterMessage) { diff --git a/app/command.go b/app/command.go index dd5eb5ce68..00ef70b414 100644 --- a/app/command.go +++ b/app/command.go @@ -15,11 +15,11 @@ import ( "sync" "unicode" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) const ( diff --git a/app/command_autocomplete.go b/app/command_autocomplete.go index 1db392e3ae..c48d11ed68 100644 --- a/app/command_autocomplete.go +++ b/app/command_autocomplete.go @@ -10,9 +10,9 @@ import ( "sort" "strings" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) // AutocompleteDynamicArgProvider dynamically provides auto-completion args for built-in commands. diff --git a/app/command_autocomplete_test.go b/app/command_autocomplete_test.go index 3f7b1df22f..a8e2a5567b 100644 --- a/app/command_autocomplete_test.go +++ b/app/command_autocomplete_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) func TestParseStaticListArgument(t *testing.T) { diff --git a/app/compliance.go b/app/compliance.go index 0b4efaeaab..f2366b9c21 100644 --- a/app/compliance.go +++ b/app/compliance.go @@ -8,8 +8,8 @@ import ( "io/ioutil" "net/http" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func (a *App) GetComplianceReports(page, perPage int) (model.Compliances, *model.AppError) { diff --git a/app/config.go b/app/config.go index 4277758bb9..c1161f8d0d 100644 --- a/app/config.go +++ b/app/config.go @@ -20,11 +20,11 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/config" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mail" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/config" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mail" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/utils" ) const ( diff --git a/app/config_test.go b/app/config_test.go index 9296f0f913..8f994b9a63 100644 --- a/app/config_test.go +++ b/app/config_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v6/utils" ) func TestConfigListener(t *testing.T) { diff --git a/app/context.go b/app/context.go index c3448d355d..3363221f09 100644 --- a/app/context.go +++ b/app/context.go @@ -6,9 +6,9 @@ package app import ( "context" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/store/sqlstore" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/store/sqlstore" ) // WithMaster adds the context value that master DB should be selected for this request. diff --git a/app/data_retention.go b/app/data_retention.go index 949903e74b..e7b914e14d 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/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func (a *App) GetGlobalRetentionPolicy() (*model.GlobalRetentionPolicy, *model.AppError) { diff --git a/app/download.go b/app/download.go index 7dcb556e81..9ab983d936 100644 --- a/app/download.go +++ b/app/download.go @@ -12,8 +12,8 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/utils" ) const ( diff --git a/app/download_test.go b/app/download_test.go index 7a7f7fa625..1f34fc16ac 100644 --- a/app/download_test.go +++ b/app/download_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestDownloadFromURL(t *testing.T) { diff --git a/app/email/email.go b/app/email/email.go index f4db97b9c1..abd1091e15 100644 --- a/app/email/email.go +++ b/app/email/email.go @@ -14,11 +14,11 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mail" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/shared/templates" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mail" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/templates" "github.com/pkg/errors" ) diff --git a/app/email/email_batching.go b/app/email/email_batching.go index 506df32dbb..0876d8d13b 100644 --- a/app/email/email_batching.go +++ b/app/email/email_batching.go @@ -13,9 +13,9 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const ( diff --git a/app/email/email_batching_test.go b/app/email/email_batching_test.go index 5de399dde7..2b1a334db6 100644 --- a/app/email/email_batching_test.go +++ b/app/email/email_batching_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestHandleNewNotifications(t *testing.T) { diff --git a/app/email/email_test.go b/app/email/email_test.go index bd1aa9d182..98b0fd3c90 100644 --- a/app/email/email_test.go +++ b/app/email/email_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mail" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mail" ) func TestCondenseSiteURL(t *testing.T) { diff --git a/app/email/helper_test.go b/app/email/helper_test.go index 798ab5deac..4405e2e15f 100644 --- a/app/email/helper_test.go +++ b/app/email/helper_test.go @@ -10,16 +10,16 @@ import ( "path/filepath" "testing" - "github.com/mattermost/mattermost-server/v5/config" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v5/services/users" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/shared/templates" - "github.com/mattermost/mattermost-server/v5/store" - "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v5/testlib" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/config" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/v6/services/users" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/templates" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v6/testlib" + "github.com/mattermost/mattermost-server/v6/utils" ) type TestHelper struct { diff --git a/app/email/main_test.go b/app/email/main_test.go index 3ab631a950..587877f33d 100644 --- a/app/email/main_test.go +++ b/app/email/main_test.go @@ -7,8 +7,8 @@ import ( "flag" "testing" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/testlib" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/testlib" ) var mainHelper *testlib.MainHelper diff --git a/app/email/notification_email.go b/app/email/notification_email.go index f7e893d269..32ab36bd50 100644 --- a/app/email/notification_email.go +++ b/app/email/notification_email.go @@ -8,9 +8,9 @@ import ( "path/filepath" "strings" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) func (es *Service) GetMessageForNotification(post *model.Post, translateFunc i18n.TranslateFunc) string { diff --git a/app/email/service.go b/app/email/service.go index e2243bbc2f..b81e30931d 100644 --- a/app/email/service.go +++ b/app/email/service.go @@ -11,10 +11,10 @@ import ( "github.com/throttled/throttled" "github.com/throttled/throttled/store/memstore" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/users" - "github.com/mattermost/mattermost-server/v5/shared/templates" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/users" + "github.com/mattermost/mattermost-server/v6/shared/templates" + "github.com/mattermost/mattermost-server/v6/store" ) const ( diff --git a/app/email/utils.go b/app/email/utils.go index 57c8f53443..cb7981eba7 100644 --- a/app/email/utils.go +++ b/app/email/utils.go @@ -4,8 +4,8 @@ package email import ( - "github.com/mattermost/mattermost-server/v5/shared/mail" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/shared/mail" + "github.com/mattermost/mattermost-server/v6/utils" ) func (es *Service) mailServiceConfig() *mail.SMTPConfig { diff --git a/app/email_test.go b/app/email_test.go index bd78f0e8eb..7e2abb5a24 100644 --- a/app/email_test.go +++ b/app/email_test.go @@ -8,7 +8,7 @@ import ( "strconv" "testing" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/app/emoji.go b/app/emoji.go index c7cffe54bc..2affcaa457 100644 --- a/app/emoji.go +++ b/app/emoji.go @@ -21,10 +21,10 @@ import ( "github.com/disintegration/imaging" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/utils" ) const ( diff --git a/app/enterprise.go b/app/enterprise.go index 38de7fbddb..9fd035f2fa 100644 --- a/app/enterprise.go +++ b/app/enterprise.go @@ -4,12 +4,12 @@ package app import ( - "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/model" - "github.com/mattermost/mattermost-server/v5/services/searchengine" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/einterfaces" + ejobs "github.com/mattermost/mattermost-server/v6/einterfaces/jobs" + tjobs "github.com/mattermost/mattermost-server/v6/jobs/interfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/searchengine" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) var accountMigrationInterface func(*Server) einterfaces.AccountMigrationInterface diff --git a/app/enterprise_test.go b/app/enterprise_test.go index a7ec1b5fdd..d486af5e34 100644 --- a/app/enterprise_test.go +++ b/app/enterprise_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/mattermost/mattermost-server/v5/einterfaces" - "github.com/mattermost/mattermost-server/v5/einterfaces/mocks" - "github.com/mattermost/mattermost-server/v5/model" - storemocks "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/einterfaces/mocks" + "github.com/mattermost/mattermost-server/v6/model" + storemocks "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) func TestSAMLSettings(t *testing.T) { diff --git a/app/expirynotify.go b/app/expirynotify.go index af0a452caf..78973d3011 100644 --- a/app/expirynotify.go +++ b/app/expirynotify.go @@ -6,9 +6,9 @@ package app import ( "net/http" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const ( diff --git a/app/expirynotify_test.go b/app/expirynotify_test.go index f49688b4c2..31e23b8c71 100644 --- a/app/expirynotify_test.go +++ b/app/expirynotify_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestNotifySessionsExpired(t *testing.T) { diff --git a/app/export.go b/app/export.go index 905c2738bb..becfa2da83 100644 --- a/app/export.go +++ b/app/export.go @@ -15,9 +15,9 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) type BulkExportOpts struct { diff --git a/app/export_converters.go b/app/export_converters.go index c4deac8b41..027d453d9c 100644 --- a/app/export_converters.go +++ b/app/export_converters.go @@ -6,7 +6,7 @@ package app import ( "strings" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func ImportLineFromTeam(team *model.TeamForExport) *LineImportData { diff --git a/app/export_test.go b/app/export_test.go index 03f2988b60..eecfa33d46 100644 --- a/app/export_test.go +++ b/app/export_test.go @@ -14,9 +14,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/utils" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/utils" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) func TestReactionsOfPost(t *testing.T) { diff --git a/app/extract_plugin_tar.go b/app/extract_plugin_tar.go index 65c8646a7e..4a62e6ee5f 100644 --- a/app/extract_plugin_tar.go +++ b/app/extract_plugin_tar.go @@ -13,7 +13,7 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) // extractTarGz takes in an io.Reader containing the bytes for a .tar.gz file and diff --git a/app/feature_flags.go b/app/feature_flags.go index 00b7217eb0..dcd888cb8d 100644 --- a/app/feature_flags.go +++ b/app/feature_flags.go @@ -8,8 +8,8 @@ import ( "os" "time" - "github.com/mattermost/mattermost-server/v5/app/featureflag" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app/featureflag" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) // setupFeatureFlags called on startup and when the cluster leader changes. diff --git a/app/featureflag/feature_flags_sync.go b/app/featureflag/feature_flags_sync.go index 0f1ad5c08b..224574b1bd 100644 --- a/app/featureflag/feature_flags_sync.go +++ b/app/featureflag/feature_flags_sync.go @@ -13,8 +13,8 @@ import ( "github.com/splitio/go-client/v6/splitio/client" "github.com/splitio/go-client/v6/splitio/conf" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) type SyncParams struct { diff --git a/app/featureflag/feature_flags_sync_test.go b/app/featureflag/feature_flags_sync_test.go index 1394be7ab9..dc4f59a501 100644 --- a/app/featureflag/feature_flags_sync_test.go +++ b/app/featureflag/feature_flags_sync_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestGetStructFields(t *testing.T) { diff --git a/app/featureflag/split_logger.go b/app/featureflag/split_logger.go index 94040cc4f9..3b55283c18 100644 --- a/app/featureflag/split_logger.go +++ b/app/featureflag/split_logger.go @@ -6,7 +6,7 @@ package featureflag import ( "fmt" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) type splitLogger struct { diff --git a/app/file.go b/app/file.go index 07899935f8..574c2dd4c4 100644 --- a/app/file.go +++ b/app/file.go @@ -24,15 +24,15 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/v5/app/imaging" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/services/docextractor" - "github.com/mattermost/mattermost-server/v5/shared/filestore" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/app/imaging" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/services/docextractor" + "github.com/mattermost/mattermost-server/v6/shared/filestore" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/utils" "github.com/pkg/errors" ) diff --git a/app/file_bench_test.go b/app/file_bench_test.go index d01d3c2de2..44c7516851 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/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) var randomJPEG []byte diff --git a/app/file_test.go b/app/file_test.go index 7810a528c9..516b088646 100644 --- a/app/file_test.go +++ b/app/file_test.go @@ -16,10 +16,10 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/searchengine/mocks" - filesStoreMocks "github.com/mattermost/mattermost-server/v5/shared/filestore/mocks" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/searchengine/mocks" + filesStoreMocks "github.com/mattermost/mattermost-server/v6/shared/filestore/mocks" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) func TestGeneratePublicLinkHash(t *testing.T) { diff --git a/app/group.go b/app/group.go index 002286d239..4483929da5 100644 --- a/app/group.go +++ b/app/group.go @@ -7,8 +7,8 @@ import ( "errors" "net/http" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func (a *App) GetGroup(id string) (*model.Group, *model.AppError) { diff --git a/app/group_test.go b/app/group_test.go index 8e4478939d..4b660b07af 100644 --- a/app/group_test.go +++ b/app/group_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestGetGroup(t *testing.T) { diff --git a/app/helper_test.go b/app/helper_test.go index ae3666cb89..febb49fda7 100644 --- a/app/helper_test.go +++ b/app/helper_test.go @@ -17,17 +17,17 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/app/request" - "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/shared/mlog" - "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/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v5/testlib" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/config" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/store/localcachelayer" + "github.com/mattermost/mattermost-server/v6/store/sqlstore" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v6/testlib" + "github.com/mattermost/mattermost-server/v6/utils" ) type TestHelper struct { diff --git a/app/image.go b/app/image.go index 0d5089e0a2..0ef51622a6 100644 --- a/app/image.go +++ b/app/image.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - "github.com/mattermost/mattermost-server/v5/app/imaging" + "github.com/mattermost/mattermost-server/v6/app/imaging" ) func checkImageResolutionLimit(w, h int) error { diff --git a/app/imaging/decode_bench_test.go b/app/imaging/decode_bench_test.go index 8a78ad7a6d..e9c1dae04f 100644 --- a/app/imaging/decode_bench_test.go +++ b/app/imaging/decode_bench_test.go @@ -10,7 +10,7 @@ import ( "sync" "testing" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" "github.com/stretchr/testify/require" ) diff --git a/app/imaging/decode_test.go b/app/imaging/decode_test.go index 6dc98792c1..65866c6bc4 100644 --- a/app/imaging/decode_test.go +++ b/app/imaging/decode_test.go @@ -9,7 +9,7 @@ import ( "sync" "testing" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" "github.com/stretchr/testify/require" ) diff --git a/app/imaging/utils_test.go b/app/imaging/utils_test.go index 50ae74d38e..cdd81db44d 100644 --- a/app/imaging/utils_test.go +++ b/app/imaging/utils_test.go @@ -10,7 +10,7 @@ import ( "os" "testing" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" "github.com/stretchr/testify/require" ) diff --git a/app/import.go b/app/import.go index e12e80d8a2..af5c6aec0c 100644 --- a/app/import.go +++ b/app/import.go @@ -15,9 +15,9 @@ import ( "strings" "sync" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const ( diff --git a/app/import_functions.go b/app/import_functions.go index bf6c19fa77..7db746e55d 100644 --- a/app/import_functions.go +++ b/app/import_functions.go @@ -16,12 +16,12 @@ import ( "path" "strings" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/users" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/users" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/utils" ) // diff --git a/app/import_functions_test.go b/app/import_functions_test.go index a3e432e0c0..2cc06484ab 100644 --- a/app/import_functions_test.go +++ b/app/import_functions_test.go @@ -15,9 +15,9 @@ import ( "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/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) func TestImportImportScheme(t *testing.T) { diff --git a/app/import_test.go b/app/import_test.go index c1bdd96faf..c3885c2cd5 100644 --- a/app/import_test.go +++ b/app/import_test.go @@ -15,9 +15,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/utils" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/utils" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) func ptrStr(s string) *string { diff --git a/app/import_types.go b/app/import_types.go index c53381bd11..2de53ce784 100644 --- a/app/import_types.go +++ b/app/import_types.go @@ -6,7 +6,7 @@ package app import ( "archive/zip" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) // Import Data Models diff --git a/app/import_validators.go b/app/import_validators.go index 0d1412f984..5df7887b30 100644 --- a/app/import_validators.go +++ b/app/import_validators.go @@ -10,7 +10,7 @@ import ( "strings" "unicode/utf8" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func validateSchemeImportData(data *SchemeImportData) *model.AppError { diff --git a/app/import_validators_test.go b/app/import_validators_test.go index cd4fc57c51..5b90602051 100644 --- a/app/import_validators_test.go +++ b/app/import_validators_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) func TestImportValidateSchemeImportData(t *testing.T) { diff --git a/app/integration_action.go b/app/integration_action.go index 3137637490..f8cdf3ea5d 100644 --- a/app/integration_action.go +++ b/app/integration_action.go @@ -32,12 +32,12 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/utils" ) func (a *App) DoPostAction(c *request.Context, postID, actionId, userID, selectedOption string) (string, *model.AppError) { diff --git a/app/integration_action_test.go b/app/integration_action_test.go index 1a041f4215..f4c77cfcd8 100644 --- a/app/integration_action_test.go +++ b/app/integration_action_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) // Test for MM-13598 where an invalid integration URL was causing a crash @@ -536,8 +536,8 @@ func TestSubmitInteractiveDialog(t *testing.T) { import ( "net/http" - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { @@ -824,8 +824,8 @@ func TestPostActionRelativePluginURL(t *testing.T) { import ( "net/http" - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { @@ -1025,7 +1025,7 @@ func TestDoPluginRequest(t *testing.T) { "reflect" "sort" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/plugin" ) type MyPlugin struct { diff --git a/app/job.go b/app/job.go index 6e0ee03866..650a0eeb7b 100644 --- a/app/job.go +++ b/app/job.go @@ -7,8 +7,8 @@ import ( "errors" "net/http" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func (a *App) GetJob(id string) (*model.Job, *model.AppError) { diff --git a/app/job_test.go b/app/job_test.go index 0a82d1135f..55ddb6b975 100644 --- a/app/job_test.go +++ b/app/job_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store/sqlstore" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store/sqlstore" ) func TestGetJob(t *testing.T) { diff --git a/app/ldap.go b/app/ldap.go index 969dbc8700..2b7c9fdcd8 100644 --- a/app/ldap.go +++ b/app/ldap.go @@ -8,9 +8,9 @@ import ( "mime/multipart" "net/http" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) // SyncLdap starts an LDAP sync job. diff --git a/app/license.go b/app/license.go index e945bb7992..0dea661fcb 100644 --- a/app/license.go +++ b/app/license.go @@ -13,10 +13,10 @@ import ( "github.com/dgrijalva/jwt-go" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/jobs" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/jobs" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/utils" ) const ( diff --git a/app/license_test.go b/app/license_test.go index 76ec34d910..3b04e398b5 100644 --- a/app/license_test.go +++ b/app/license_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestLoadLicense(t *testing.T) { diff --git a/app/login.go b/app/login.go index e2382c6e24..eac0436c6d 100644 --- a/app/login.go +++ b/app/login.go @@ -15,12 +15,12 @@ import ( "github.com/avct/uasurfer" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/utils" ) const cwsTokenEnv = "CWS_CLOUD_TOKEN" diff --git a/app/login_test.go b/app/login_test.go index 2674b424a8..784ad43b5d 100644 --- a/app/login_test.go +++ b/app/login_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestCheckForClientSideCert(t *testing.T) { diff --git a/app/main_test.go b/app/main_test.go index ae664aa78d..486e7d6b30 100644 --- a/app/main_test.go +++ b/app/main_test.go @@ -7,8 +7,8 @@ import ( "flag" "testing" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/testlib" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/testlib" ) var mainHelper *testlib.MainHelper diff --git a/app/migrations.go b/app/migrations.go index 88b1efc4bd..31b1500854 100644 --- a/app/migrations.go +++ b/app/migrations.go @@ -8,9 +8,9 @@ import ( "fmt" "reflect" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/utils" ) const EmojisPermissionsMigrationKey = "EmojisPermissionsMigrationComplete" diff --git a/app/notification.go b/app/notification.go index 8bc943fa29..e3dbd4ff90 100644 --- a/app/notification.go +++ b/app/notification.go @@ -13,11 +13,11 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/markdown" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/markdown" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) func (a *App) SendNotifications(post *model.Post, team *model.Team, channel *model.Channel, sender *model.User, parentPostList *model.PostList, setOnline bool) ([]string, error) { diff --git a/app/notification_email.go b/app/notification_email.go index 43d5a84025..52fbf5ee58 100644 --- a/app/notification_email.go +++ b/app/notification_email.go @@ -12,9 +12,9 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" "github.com/pkg/errors" ) diff --git a/app/notification_email_test.go b/app/notification_email_test.go index 957aa0a8c6..6f08db581a 100644 --- a/app/notification_email_test.go +++ b/app/notification_email_test.go @@ -14,10 +14,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/timezones" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/timezones" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) func TestGetDirectMessageNotificationEmailSubject(t *testing.T) { diff --git a/app/notification_push.go b/app/notification_push.go index 96c6b78723..9367e9e93e 100644 --- a/app/notification_push.go +++ b/app/notification_push.go @@ -13,10 +13,10 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/utils" ) type notificationType string diff --git a/app/notification_push_test.go b/app/notification_push_test.go index 8cff678853..69f2da4658 100644 --- a/app/notification_push_test.go +++ b/app/notification_push_test.go @@ -15,11 +15,11 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/config" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v5/testlib" + "github.com/mattermost/mattermost-server/v6/config" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v6/testlib" ) func TestDoesNotifyPropsAllowPushNotification(t *testing.T) { diff --git a/app/notification_test.go b/app/notification_test.go index f3857a3a63..20231bf3ab 100644 --- a/app/notification_test.go +++ b/app/notification_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/utils" ) func TestSendNotifications(t *testing.T) { diff --git a/app/oauth.go b/app/oauth.go index 131610d419..3a7f05fba6 100644 --- a/app/oauth.go +++ b/app/oauth.go @@ -18,14 +18,14 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/einterfaces" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/users" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/users" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/utils" ) const ( diff --git a/app/oauth_test.go b/app/oauth_test.go index 9db24d0b0c..6cd36f246c 100644 --- a/app/oauth_test.go +++ b/app/oauth_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestGetOAuthAccessTokenForImplicitFlow(t *testing.T) { diff --git a/app/opengraph.go b/app/opengraph.go index 773221a278..3e51440249 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/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const MaxOpenGraphResponseSize = 1024 * 1024 * 50 diff --git a/app/opentracing/opentracing_layer.go b/app/opentracing/opentracing_layer.go index b534660d20..510c681c54 100644 --- a/app/opentracing/opentracing_layer.go +++ b/app/opentracing/opentracing_layer.go @@ -19,22 +19,22 @@ import ( "time" "github.com/dyatlov/go-opengraph/opengraph" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/einterfaces" - "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/remotecluster" - "github.com/mattermost/mattermost-server/v5/services/searchengine" - "github.com/mattermost/mattermost-server/v5/services/timezones" - "github.com/mattermost/mattermost-server/v5/services/tracing" - "github.com/mattermost/mattermost-server/v5/shared/filestore" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/services/httpservice" + "github.com/mattermost/mattermost-server/v6/services/imageproxy" + "github.com/mattermost/mattermost-server/v6/services/remotecluster" + "github.com/mattermost/mattermost-server/v6/services/searchengine" + "github.com/mattermost/mattermost-server/v6/services/timezones" + "github.com/mattermost/mattermost-server/v6/services/tracing" + "github.com/mattermost/mattermost-server/v6/shared/filestore" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" "github.com/opentracing/opentracing-go/ext" spanlog "github.com/opentracing/opentracing-go/log" ) diff --git a/app/options.go b/app/options.go index 7028cd61fd..c09fb3c82d 100644 --- a/app/options.go +++ b/app/options.go @@ -6,10 +6,10 @@ package app import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/config" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/config" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) type Option func(s *Server) error diff --git a/app/permissions.go b/app/permissions.go index e261922275..8abc4ea710 100644 --- a/app/permissions.go +++ b/app/permissions.go @@ -13,7 +13,7 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) const permissionsExportBatchSize = 100 diff --git a/app/permissions_migrations.go b/app/permissions_migrations.go index ce8d3b444c..6b1b3160da 100644 --- a/app/permissions_migrations.go +++ b/app/permissions_migrations.go @@ -8,8 +8,8 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type permissionTransformation struct { diff --git a/app/permissions_migrations_test.go b/app/permissions_migrations_test.go index ec4bb168f2..1b20ddf1d4 100644 --- a/app/permissions_migrations_test.go +++ b/app/permissions_migrations_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestApplyPermissionsMap(t *testing.T) { diff --git a/app/permissions_test.go b/app/permissions_test.go index 6071cf87af..bfe98f5992 100644 --- a/app/permissions_test.go +++ b/app/permissions_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type testWriter struct { diff --git a/app/plugin.go b/app/plugin.go index d2257e91d3..c108142a6c 100644 --- a/app/plugin.go +++ b/app/plugin.go @@ -20,13 +20,13 @@ import ( svg "github.com/h2non/go-is-svg" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/services/marketplace" - "github.com/mattermost/mattermost-server/v5/shared/filestore" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/services/marketplace" + "github.com/mattermost/mattermost-server/v6/shared/filestore" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) const prepackagedPluginsDir = "prepackaged_plugins" diff --git a/app/plugin_api.go b/app/plugin_api.go index 983a636a5f..949e8c9946 100644 --- a/app/plugin_api.go +++ b/app/plugin_api.go @@ -15,10 +15,10 @@ import ( "path/filepath" "strings" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) type PluginAPI struct { diff --git a/app/plugin_api_test.go b/app/plugin_api_test.go index 52af411062..afcab8bc03 100644 --- a/app/plugin_api_test.go +++ b/app/plugin_api_test.go @@ -25,13 +25,13 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/einterfaces/mocks" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/utils" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/einterfaces/mocks" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/utils" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) func getDefaultPluginSettingsSchema() string { @@ -143,7 +143,7 @@ func TestPublicFilesPathConfiguration(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/plugin" ) type MyPlugin struct { @@ -755,7 +755,7 @@ func TestPluginAPIGetPlugins(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/plugin" ) type MyPlugin struct { @@ -907,7 +907,7 @@ func TestInstallPlugin(t *testing.T) { "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/plugin" ) type configuration struct { @@ -1404,7 +1404,7 @@ func TestInterpluginPluginHTTP(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/plugin" "bytes" "net/http" ) @@ -1445,8 +1445,8 @@ func TestInterpluginPluginHTTP(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" "bytes" "net/http" "io/ioutil" @@ -1550,8 +1550,8 @@ func TestApiMetrics(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" ) type MyPlugin struct { diff --git a/app/plugin_api_tests/manual.test_http_hijack_plugin/main.go b/app/plugin_api_tests/manual.test_http_hijack_plugin/main.go index f4aea8296f..cb2ec08b94 100644 --- a/app/plugin_api_tests/manual.test_http_hijack_plugin/main.go +++ b/app/plugin_api_tests/manual.test_http_hijack_plugin/main.go @@ -6,7 +6,7 @@ package main import ( "net/http" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/plugin" ) type Plugin struct { diff --git a/app/plugin_api_tests/manual.test_http_upgrade_websocket_plugin/main.go b/app/plugin_api_tests/manual.test_http_upgrade_websocket_plugin/main.go index 1b943f0a26..b34581a668 100644 --- a/app/plugin_api_tests/manual.test_http_upgrade_websocket_plugin/main.go +++ b/app/plugin_api_tests/manual.test_http_upgrade_websocket_plugin/main.go @@ -9,8 +9,8 @@ import ( "github.com/gorilla/websocket" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" ) type Plugin struct { diff --git a/app/plugin_api_tests/manual.test_load_configuration_defaults_plugin/main.go b/app/plugin_api_tests/manual.test_load_configuration_defaults_plugin/main.go index 170fe6c41c..22d8947ac3 100644 --- a/app/plugin_api_tests/manual.test_load_configuration_defaults_plugin/main.go +++ b/app/plugin_api_tests/manual.test_load_configuration_defaults_plugin/main.go @@ -4,9 +4,9 @@ package main import ( - "github.com/mattermost/mattermost-server/v5/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" ) type configuration struct { diff --git a/app/plugin_api_tests/manual.test_load_configuration_plugin/main.go b/app/plugin_api_tests/manual.test_load_configuration_plugin/main.go index 1c377fddac..9d0aa31579 100644 --- a/app/plugin_api_tests/manual.test_load_configuration_plugin/main.go +++ b/app/plugin_api_tests/manual.test_load_configuration_plugin/main.go @@ -6,9 +6,9 @@ package main import ( "fmt" - "github.com/mattermost/mattermost-server/v5/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" ) type configuration struct { diff --git a/app/plugin_api_tests/test_bots_plugin/main.go b/app/plugin_api_tests/test_bots_plugin/main.go index a048d421c6..337ef64282 100644 --- a/app/plugin_api_tests/test_bots_plugin/main.go +++ b/app/plugin_api_tests/test_bots_plugin/main.go @@ -4,9 +4,9 @@ package main import ( - "github.com/mattermost/mattermost-server/v5/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" ) type MyPlugin struct { diff --git a/app/plugin_api_tests/test_call_log_api_plugin/main.go b/app/plugin_api_tests/test_call_log_api_plugin/main.go index 102b942275..dc21bc3acf 100644 --- a/app/plugin_api_tests/test_call_log_api_plugin/main.go +++ b/app/plugin_api_tests/test_call_log_api_plugin/main.go @@ -6,8 +6,8 @@ package main import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" ) type PluginUsingLogAPI struct { diff --git a/app/plugin_api_tests/test_db_driver/main.go b/app/plugin_api_tests/test_db_driver/main.go index 96311dd619..6c39981b27 100644 --- a/app/plugin_api_tests/test_db_driver/main.go +++ b/app/plugin_api_tests/test_db_driver/main.go @@ -7,12 +7,12 @@ import ( "database/sql" "testing" - "github.com/mattermost/mattermost-server/v5/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/shared/driver" - "github.com/mattermost/mattermost-server/v5/store/sqlstore" - "github.com/mattermost/mattermost-server/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/shared/driver" + "github.com/mattermost/mattermost-server/v6/store/sqlstore" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) type MyPlugin struct { diff --git a/app/plugin_api_tests/test_get_bundle_path_plugin/main.go b/app/plugin_api_tests/test_get_bundle_path_plugin/main.go index 88af695eb6..d352fa1d83 100644 --- a/app/plugin_api_tests/test_get_bundle_path_plugin/main.go +++ b/app/plugin_api_tests/test_get_bundle_path_plugin/main.go @@ -7,9 +7,9 @@ import ( "fmt" "path/filepath" - "github.com/mattermost/mattermost-server/v5/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" ) type MyPlugin struct { diff --git a/app/plugin_api_tests/test_get_channels_for_team_for_user_plugin/main.go b/app/plugin_api_tests/test_get_channels_for_team_for_user_plugin/main.go index a9e0630239..cb83c9c526 100644 --- a/app/plugin_api_tests/test_get_channels_for_team_for_user_plugin/main.go +++ b/app/plugin_api_tests/test_get_channels_for_team_for_user_plugin/main.go @@ -4,9 +4,9 @@ package main import ( - "github.com/mattermost/mattermost-server/v5/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" ) type MyPlugin struct { diff --git a/app/plugin_api_tests/test_get_direct_channel_plugin/main.go b/app/plugin_api_tests/test_get_direct_channel_plugin/main.go index ba019af4d7..d4fc157817 100644 --- a/app/plugin_api_tests/test_get_direct_channel_plugin/main.go +++ b/app/plugin_api_tests/test_get_direct_channel_plugin/main.go @@ -4,9 +4,9 @@ package main import ( - "github.com/mattermost/mattermost-server/v5/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" ) type MyPlugin struct { diff --git a/app/plugin_api_tests/test_get_plugin_status_plugin/main.go b/app/plugin_api_tests/test_get_plugin_status_plugin/main.go index 2e0a1d3747..d23dcdca25 100644 --- a/app/plugin_api_tests/test_get_plugin_status_plugin/main.go +++ b/app/plugin_api_tests/test_get_plugin_status_plugin/main.go @@ -4,9 +4,9 @@ package main import ( - "github.com/mattermost/mattermost-server/v5/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" ) type MyPlugin struct { diff --git a/app/plugin_api_tests/test_get_profile_image_plugin/main.go b/app/plugin_api_tests/test_get_profile_image_plugin/main.go index fe50798f50..92befd6e56 100644 --- a/app/plugin_api_tests/test_get_profile_image_plugin/main.go +++ b/app/plugin_api_tests/test_get_profile_image_plugin/main.go @@ -4,9 +4,9 @@ package main import ( - "github.com/mattermost/mattermost-server/v5/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" ) type MyPlugin struct { diff --git a/app/plugin_api_tests/test_member_channels_plugin/main.go b/app/plugin_api_tests/test_member_channels_plugin/main.go index 578bd5830a..044c2d5946 100644 --- a/app/plugin_api_tests/test_member_channels_plugin/main.go +++ b/app/plugin_api_tests/test_member_channels_plugin/main.go @@ -4,9 +4,9 @@ package main import ( - "github.com/mattermost/mattermost-server/v5/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" ) type MyPlugin struct { diff --git a/app/plugin_api_tests/test_members_plugin/main.go b/app/plugin_api_tests/test_members_plugin/main.go index 869cbd807f..5886f47644 100644 --- a/app/plugin_api_tests/test_members_plugin/main.go +++ b/app/plugin_api_tests/test_members_plugin/main.go @@ -4,9 +4,9 @@ package main import ( - "github.com/mattermost/mattermost-server/v5/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" ) type MyPlugin struct { diff --git a/app/plugin_api_tests/test_search_channels_plugin/main.go b/app/plugin_api_tests/test_search_channels_plugin/main.go index a2c7653a6f..6846a805d3 100644 --- a/app/plugin_api_tests/test_search_channels_plugin/main.go +++ b/app/plugin_api_tests/test_search_channels_plugin/main.go @@ -4,9 +4,9 @@ package main import ( - "github.com/mattermost/mattermost-server/v5/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" ) type MyPlugin struct { diff --git a/app/plugin_api_tests/test_search_posts_in_team_plugin/main.go b/app/plugin_api_tests/test_search_posts_in_team_plugin/main.go index 6821033aee..1ca86edf19 100644 --- a/app/plugin_api_tests/test_search_posts_in_team_plugin/main.go +++ b/app/plugin_api_tests/test_search_posts_in_team_plugin/main.go @@ -6,9 +6,9 @@ package main import ( "fmt" - "github.com/mattermost/mattermost-server/v5/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" ) type MyPlugin struct { diff --git a/app/plugin_api_tests/test_search_teams_plugin/main.go b/app/plugin_api_tests/test_search_teams_plugin/main.go index 6aab894766..4b23cb3194 100644 --- a/app/plugin_api_tests/test_search_teams_plugin/main.go +++ b/app/plugin_api_tests/test_search_teams_plugin/main.go @@ -6,9 +6,9 @@ package main import ( "fmt" - "github.com/mattermost/mattermost-server/v5/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" ) type MyPlugin struct { diff --git a/app/plugin_api_tests/test_send_mail_plugin/main.go b/app/plugin_api_tests/test_send_mail_plugin/main.go index d3fec5f469..ca90a8403c 100644 --- a/app/plugin_api_tests/test_send_mail_plugin/main.go +++ b/app/plugin_api_tests/test_send_mail_plugin/main.go @@ -7,10 +7,10 @@ import ( "fmt" "strings" - "github.com/mattermost/mattermost-server/v5/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/shared/mail" + "github.com/mattermost/mattermost-server/v6/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/shared/mail" ) type MyPlugin struct { diff --git a/app/plugin_api_tests/test_set_profile_image_plugin/main.go b/app/plugin_api_tests/test_set_profile_image_plugin/main.go index b73fe0644f..9644193db8 100644 --- a/app/plugin_api_tests/test_set_profile_image_plugin/main.go +++ b/app/plugin_api_tests/test_set_profile_image_plugin/main.go @@ -10,9 +10,9 @@ import ( "image/color" "image/png" - "github.com/mattermost/mattermost-server/v5/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" ) type MyPlugin struct { diff --git a/app/plugin_api_tests/test_update_user_active_plugin/main.go b/app/plugin_api_tests/test_update_user_active_plugin/main.go index 974358e674..265df15c12 100644 --- a/app/plugin_api_tests/test_update_user_active_plugin/main.go +++ b/app/plugin_api_tests/test_update_user_active_plugin/main.go @@ -4,9 +4,9 @@ package main import ( - "github.com/mattermost/mattermost-server/v5/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" ) type MyPlugin struct { diff --git a/app/plugin_api_tests/test_update_user_status_plugin/main.go b/app/plugin_api_tests/test_update_user_status_plugin/main.go index fb9a5d0cfe..7e330e8cab 100644 --- a/app/plugin_api_tests/test_update_user_status_plugin/main.go +++ b/app/plugin_api_tests/test_update_user_status_plugin/main.go @@ -6,9 +6,9 @@ package main import ( "fmt" - "github.com/mattermost/mattermost-server/v5/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" ) type MyPlugin struct { diff --git a/app/plugin_commands.go b/app/plugin_commands.go index c7b9c1192b..47830f9f4d 100644 --- a/app/plugin_commands.go +++ b/app/plugin_commands.go @@ -11,8 +11,8 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" ) type PluginCommand struct { diff --git a/app/plugin_commands_test.go b/app/plugin_commands_test.go index ca005d7d95..f53b3c8e44 100644 --- a/app/plugin_commands_test.go +++ b/app/plugin_commands_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) func TestPluginCommand(t *testing.T) { @@ -39,8 +39,8 @@ func TestPluginCommand(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type configuration struct { @@ -120,8 +120,8 @@ func TestPluginCommand(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type configuration struct { @@ -227,8 +227,8 @@ func TestPluginCommand(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type configuration struct { @@ -292,8 +292,8 @@ func TestPluginCommand(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { @@ -337,8 +337,8 @@ func TestPluginCommand(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { diff --git a/app/plugin_db_driver.go b/app/plugin_db_driver.go index 11a64b2d1b..6b99602a61 100644 --- a/app/plugin_db_driver.go +++ b/app/plugin_db_driver.go @@ -9,8 +9,8 @@ import ( "database/sql/driver" "sync" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" ) // DriverImpl implements the plugin.Driver interface on the server-side. diff --git a/app/plugin_deadlock_test.go b/app/plugin_deadlock_test.go index 8a4041ccde..eb151aeb64 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/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestPluginDeadlock(t *testing.T) { @@ -24,8 +24,8 @@ func TestPluginDeadlock(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { @@ -112,8 +112,8 @@ func TestPluginDeadlock(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { @@ -147,8 +147,8 @@ func TestPluginDeadlock(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { @@ -218,8 +218,8 @@ func TestPluginDeadlock(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { diff --git a/app/plugin_event.go b/app/plugin_event.go index d0b6e50e15..f134401214 100644 --- a/app/plugin_event.go +++ b/app/plugin_event.go @@ -4,7 +4,7 @@ package app import ( - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func (s *Server) notifyClusterPluginEvent(event model.ClusterEvent, data model.PluginEventData) { diff --git a/app/plugin_health_check_test.go b/app/plugin_health_check_test.go index fb07cd1689..1c2d67f87f 100644 --- a/app/plugin_health_check_test.go +++ b/app/plugin_health_check_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" ) func TestHealthCheckJob(t *testing.T) { @@ -21,8 +21,8 @@ func TestHealthCheckJob(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" ) type MyPlugin struct { diff --git a/app/plugin_hooks_test.go b/app/plugin_hooks_test.go index e429ea1756..8beaa7ac3a 100644 --- a/app/plugin_hooks_test.go +++ b/app/plugin_hooks_test.go @@ -20,12 +20,12 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/einterfaces/mocks" - "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/utils" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/einterfaces/mocks" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/plugin/plugintest" + "github.com/mattermost/mattermost-server/v6/utils" ) func SetAppEnvironmentWithPlugins(t *testing.T, pluginCode []string, app *App, apiFunc func(*model.Manifest) plugin.API) (func(), []string, []error) { @@ -73,8 +73,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { @@ -113,8 +113,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { @@ -154,8 +154,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { @@ -197,8 +197,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { @@ -241,8 +241,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { @@ -263,8 +263,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { @@ -309,8 +309,8 @@ func TestHookMessageHasBeenPosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { @@ -347,8 +347,8 @@ func TestHookMessageWillBeUpdated(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { @@ -395,8 +395,8 @@ func TestHookMessageHasBeenUpdated(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { @@ -443,8 +443,8 @@ func TestHookFileWillBeUploaded(t *testing.T) { import ( "io" - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { @@ -491,8 +491,8 @@ func TestHookFileWillBeUploaded(t *testing.T) { import ( "fmt" "io" - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { @@ -543,8 +543,8 @@ func TestHookFileWillBeUploaded(t *testing.T) { import ( "io" - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { @@ -604,8 +604,8 @@ func TestHookFileWillBeUploaded(t *testing.T) { "io" "fmt" "bytes" - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { @@ -677,8 +677,8 @@ func TestUserWillLogIn_Blocked(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { @@ -716,8 +716,8 @@ func TestUserWillLogInIn_Passed(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { @@ -756,8 +756,8 @@ func TestUserHasLoggedIn(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { @@ -798,8 +798,8 @@ func TestUserHasBeenCreated(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { @@ -847,7 +847,7 @@ func TestErrorString(t *testing.T) { import ( "errors" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/plugin" ) type MyPlugin struct { @@ -876,8 +876,8 @@ func TestErrorString(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { @@ -928,8 +928,8 @@ func TestHookContext(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { @@ -971,8 +971,8 @@ func TestActiveHooks(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" ) type MyPlugin struct { @@ -1057,8 +1057,8 @@ func TestHookMetrics(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" ) type MyPlugin struct { @@ -1144,8 +1144,8 @@ func TestHookReactionHasBeenAdded(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { @@ -1186,8 +1186,8 @@ func TestHookReactionHasBeenRemoved(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { diff --git a/app/plugin_install.go b/app/plugin_install.go index e7c37fe954..edbd718f89 100644 --- a/app/plugin_install.go +++ b/app/plugin_install.go @@ -48,10 +48,10 @@ import ( "github.com/blang/semver" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/filestore" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/filestore" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/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 14da903e1c..a1b9a8fc28 100644 --- a/app/plugin_install_test.go +++ b/app/plugin_install_test.go @@ -16,8 +16,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) type nilReadSeeker struct { diff --git a/app/plugin_key_value_store.go b/app/plugin_key_value_store.go index ce9feb18e1..12dcc6a60e 100644 --- a/app/plugin_key_value_store.go +++ b/app/plugin_key_value_store.go @@ -9,9 +9,9 @@ import ( "errors" "net/http" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) func getKeyHash(key string) string { diff --git a/app/plugin_requests.go b/app/plugin_requests.go index caaa0811ef..fbc92b43d2 100644 --- a/app/plugin_requests.go +++ b/app/plugin_requests.go @@ -14,10 +14,10 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/utils" ) func (s *Server) ServePluginRequest(w http.ResponseWriter, r *http.Request) { diff --git a/app/plugin_requests_test.go b/app/plugin_requests_test.go index bb1f293299..5a35aa7f4b 100644 --- a/app/plugin_requests_test.go +++ b/app/plugin_requests_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/config" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/config" + "github.com/mattermost/mattermost-server/v6/model" ) func TestServePluginPublicRequest(t *testing.T) { diff --git a/app/plugin_shutdown_test.go b/app/plugin_shutdown_test.go index 09f158b3b7..623d249cab 100644 --- a/app/plugin_shutdown_test.go +++ b/app/plugin_shutdown_test.go @@ -24,7 +24,7 @@ func TestPluginShutdownTest(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/plugin" ) type MyPlugin struct { @@ -39,7 +39,7 @@ func TestPluginShutdownTest(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/plugin" ) type MyPlugin struct { diff --git a/app/plugin_signature.go b/app/plugin_signature.go index 06ae69f3e0..79502c69de 100644 --- a/app/plugin_signature.go +++ b/app/plugin_signature.go @@ -14,9 +14,9 @@ import ( "golang.org/x/crypto/openpgp" "golang.org/x/crypto/openpgp/armor" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/utils" ) // GetPluginPublicKeyFiles returns all public keys listed in the config. diff --git a/app/plugin_signature_test.go b/app/plugin_signature_test.go index 6fed0f6bf4..8b96de6986 100644 --- a/app/plugin_signature_test.go +++ b/app/plugin_signature_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) func TestPluginPublicKeys(t *testing.T) { diff --git a/app/plugin_statuses.go b/app/plugin_statuses.go index ab9e2e8f5c..8c3898124a 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/v5/model" + "github.com/mattermost/mattermost-server/v6/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 f3a98e9eba..4bea22c030 100644 --- a/app/plugin_test.go +++ b/app/plugin_test.go @@ -20,11 +20,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/testlib" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/testlib" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) func getHashedKey(key string) string { @@ -697,8 +697,8 @@ func TestPluginPanicLogs(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { diff --git a/app/post.go b/app/post.go index c97737f859..57dfbd7b1d 100644 --- a/app/post.go +++ b/app/post.go @@ -14,14 +14,14 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/services/cache" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" - "github.com/mattermost/mattermost-server/v5/store/sqlstore" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/services/cache" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/store/sqlstore" ) const ( diff --git a/app/post_metadata.go b/app/post_metadata.go index 48f23d9fdc..f2e8f215d7 100644 --- a/app/post_metadata.go +++ b/app/post_metadata.go @@ -16,11 +16,11 @@ import ( "github.com/dyatlov/go-opengraph/opengraph" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/cache" - "github.com/mattermost/mattermost-server/v5/shared/markdown" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/utils/imgutils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/cache" + "github.com/mattermost/mattermost-server/v6/shared/markdown" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/utils/imgutils" ) type linkMetadataCache struct { diff --git a/app/post_metadata_test.go b/app/post_metadata_test.go index 63100d6338..f80faf9d00 100644 --- a/app/post_metadata_test.go +++ b/app/post_metadata_test.go @@ -22,10 +22,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "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/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/httpservice" + "github.com/mattermost/mattermost-server/v6/services/imageproxy" + "github.com/mattermost/mattermost-server/v6/utils/testutils" ) func TestPreparePostListForClient(t *testing.T) { diff --git a/app/post_test.go b/app/post_test.go index 5607f6ebc5..b2350e2e53 100644 --- a/app/post_test.go +++ b/app/post_test.go @@ -15,15 +15,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v5/services/imageproxy" - "github.com/mattermost/mattermost-server/v5/services/searchengine/mocks" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" - "github.com/mattermost/mattermost-server/v5/store/storetest" - storemocks "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v5/testlib" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/v6/services/imageproxy" + "github.com/mattermost/mattermost-server/v6/services/searchengine/mocks" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/store/storetest" + storemocks "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v6/testlib" ) func TestCreatePostDeduplicate(t *testing.T) { @@ -57,8 +57,8 @@ func TestCreatePostDeduplicate(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" ) type MyPlugin struct { @@ -106,8 +106,8 @@ func TestCreatePostDeduplicate(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/model" "time" ) diff --git a/app/preference.go b/app/preference.go index 7a2b80d53a..989b06fe9c 100644 --- a/app/preference.go +++ b/app/preference.go @@ -7,7 +7,7 @@ import ( "errors" "net/http" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func (a *App) GetPreferencesForUser(userID string) (model.Preferences, *model.AppError) { diff --git a/app/product_notices.go b/app/product_notices.go index 6065417762..af473e9387 100644 --- a/app/product_notices.go +++ b/app/product_notices.go @@ -15,12 +15,12 @@ import ( "github.com/pkg/errors" date_constraints "github.com/reflog/dateconstraints" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/config" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/config" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/utils" ) const MaxRepeatViewings = 3 diff --git a/app/product_notices_test.go b/app/product_notices_test.go index 267ebda2e1..46272a6ef6 100644 --- a/app/product_notices_test.go +++ b/app/product_notices_test.go @@ -14,9 +14,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) func TestNoticeValidation(t *testing.T) { diff --git a/app/ratelimit.go b/app/ratelimit.go index 9260a09b8f..b05e082e25 100644 --- a/app/ratelimit.go +++ b/app/ratelimit.go @@ -13,10 +13,10 @@ import ( "github.com/throttled/throttled" "github.com/throttled/throttled/store/memstore" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/utils" ) type RateLimiter struct { diff --git a/app/ratelimit_test.go b/app/ratelimit_test.go index 82f1cc14d2..9e1818f6f6 100644 --- a/app/ratelimit_test.go +++ b/app/ratelimit_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func genRateLimitSettings(useAuth, useIP bool, header string) *model.RateLimitSettings { diff --git a/app/reaction.go b/app/reaction.go index 1e33eecd96..b826a9e7d9 100644 --- a/app/reaction.go +++ b/app/reaction.go @@ -7,9 +7,9 @@ import ( "errors" "net/http" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" ) func (a *App) SaveReactionForPost(c *request.Context, reaction *model.Reaction) (*model.Reaction, *model.AppError) { diff --git a/app/reaction_test.go b/app/reaction_test.go index 93aaef4993..ffda6717ac 100644 --- a/app/reaction_test.go +++ b/app/reaction_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/testlib" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/testlib" ) func TestSharedChannelSyncForReactionActions(t *testing.T) { diff --git a/app/remote_cluster.go b/app/remote_cluster.go index d9f544a789..3c46166eeb 100644 --- a/app/remote_cluster.go +++ b/app/remote_cluster.go @@ -8,10 +8,10 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/services/remotecluster" - "github.com/mattermost/mattermost-server/v5/store/sqlstore" + "github.com/mattermost/mattermost-server/v6/services/remotecluster" + "github.com/mattermost/mattermost-server/v6/store/sqlstore" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func (a *App) AddRemoteCluster(rc *model.RemoteCluster) (*model.RemoteCluster, *model.AppError) { diff --git a/app/remote_cluster_service_mock.go b/app/remote_cluster_service_mock.go index 4a42e64a15..20e7139dfa 100644 --- a/app/remote_cluster_service_mock.go +++ b/app/remote_cluster_service_mock.go @@ -6,8 +6,8 @@ package app import ( "context" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/remotecluster" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/remotecluster" ) // MockOptionRemoteClusterService a mock of the remote cluster service diff --git a/app/remote_cluster_test.go b/app/remote_cluster_test.go index b93b33f98f..327789e3ba 100644 --- a/app/remote_cluster_test.go +++ b/app/remote_cluster_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) func TestAddRemoteCluster(t *testing.T) { diff --git a/app/request/context.go b/app/request/context.go index 7b67e5c1a5..228f9bdbb7 100644 --- a/app/request/context.go +++ b/app/request/context.go @@ -6,8 +6,8 @@ package request import ( "context" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) type Context struct { diff --git a/app/role.go b/app/role.go index 70d92b7c9b..dd3459d12f 100644 --- a/app/role.go +++ b/app/role.go @@ -10,9 +10,9 @@ import ( "reflect" "strings" - "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/utils" ) func (a *App) GetRole(id string) (*model.Role, *model.AppError) { diff --git a/app/role_test.go b/app/role_test.go index d6d06aee13..f59cd0da4f 100644 --- a/app/role_test.go +++ b/app/role_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/utils" ) type permissionInheritanceTestData struct { diff --git a/app/saml.go b/app/saml.go index 4179bb76ce..1e5be0f6d3 100644 --- a/app/saml.go +++ b/app/saml.go @@ -13,7 +13,7 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) const ( diff --git a/app/scheme.go b/app/scheme.go index 9c77b80f6f..34b728bde0 100644 --- a/app/scheme.go +++ b/app/scheme.go @@ -7,8 +7,8 @@ import ( "errors" "net/http" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func (a *App) GetScheme(id string) (*model.Scheme, *model.AppError) { diff --git a/app/searchengine.go b/app/searchengine.go index b1e9adaa70..7c4c0cbc83 100644 --- a/app/searchengine.go +++ b/app/searchengine.go @@ -6,8 +6,8 @@ package app import ( "net/http" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/searchengine" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/searchengine" ) func (a *App) TestElasticsearch(cfg *model.Config) *model.AppError { diff --git a/app/security_update_check.go b/app/security_update_check.go index 731f9c562f..17e409d365 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/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mail" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mail" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const ( diff --git a/app/server.go b/app/server.go index c868d94672..75d7a92aa0 100644 --- a/app/server.go +++ b/app/server.go @@ -36,41 +36,41 @@ import ( "github.com/rs/cors" "golang.org/x/crypto/acme/autocert" - "github.com/mattermost/mattermost-server/v5/app/email" - "github.com/mattermost/mattermost-server/v5/app/featureflag" - "github.com/mattermost/mattermost-server/v5/app/imaging" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/audit" - "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/model" - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/services/awsmeter" - "github.com/mattermost/mattermost-server/v5/services/cache" - "github.com/mattermost/mattermost-server/v5/services/httpservice" - "github.com/mattermost/mattermost-server/v5/services/imageproxy" - "github.com/mattermost/mattermost-server/v5/services/remotecluster" - "github.com/mattermost/mattermost-server/v5/services/searchengine" - "github.com/mattermost/mattermost-server/v5/services/searchengine/bleveengine" - "github.com/mattermost/mattermost-server/v5/services/sharedchannel" - "github.com/mattermost/mattermost-server/v5/services/telemetry" - "github.com/mattermost/mattermost-server/v5/services/timezones" - "github.com/mattermost/mattermost-server/v5/services/tracing" - "github.com/mattermost/mattermost-server/v5/services/upgrader" - "github.com/mattermost/mattermost-server/v5/services/users" - "github.com/mattermost/mattermost-server/v5/shared/filestore" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mail" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/shared/templates" - "github.com/mattermost/mattermost-server/v5/store" - "github.com/mattermost/mattermost-server/v5/store/localcachelayer" - "github.com/mattermost/mattermost-server/v5/store/retrylayer" - "github.com/mattermost/mattermost-server/v5/store/searchlayer" - "github.com/mattermost/mattermost-server/v5/store/sqlstore" - "github.com/mattermost/mattermost-server/v5/store/timerlayer" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/app/email" + "github.com/mattermost/mattermost-server/v6/app/featureflag" + "github.com/mattermost/mattermost-server/v6/app/imaging" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/config" + "github.com/mattermost/mattermost-server/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/jobs" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/services/awsmeter" + "github.com/mattermost/mattermost-server/v6/services/cache" + "github.com/mattermost/mattermost-server/v6/services/httpservice" + "github.com/mattermost/mattermost-server/v6/services/imageproxy" + "github.com/mattermost/mattermost-server/v6/services/remotecluster" + "github.com/mattermost/mattermost-server/v6/services/searchengine" + "github.com/mattermost/mattermost-server/v6/services/searchengine/bleveengine" + "github.com/mattermost/mattermost-server/v6/services/sharedchannel" + "github.com/mattermost/mattermost-server/v6/services/telemetry" + "github.com/mattermost/mattermost-server/v6/services/timezones" + "github.com/mattermost/mattermost-server/v6/services/tracing" + "github.com/mattermost/mattermost-server/v6/services/upgrader" + "github.com/mattermost/mattermost-server/v6/services/users" + "github.com/mattermost/mattermost-server/v6/shared/filestore" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mail" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/templates" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/store/localcachelayer" + "github.com/mattermost/mattermost-server/v6/store/retrylayer" + "github.com/mattermost/mattermost-server/v6/store/searchlayer" + "github.com/mattermost/mattermost-server/v6/store/sqlstore" + "github.com/mattermost/mattermost-server/v6/store/timerlayer" + "github.com/mattermost/mattermost-server/v6/utils" ) // declaring this as var to allow overriding in tests diff --git a/app/server_license.go b/app/server_license.go index ded5d93cfe..ffb0dc68ca 100644 --- a/app/server_license.go +++ b/app/server_license.go @@ -4,7 +4,7 @@ package app import ( - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func (s *Server) License() *model.License { diff --git a/app/server_test.go b/app/server_test.go index 12013a8701..e441ae3ea5 100644 --- a/app/server_test.go +++ b/app/server_test.go @@ -24,12 +24,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/config" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/filestore" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store/storetest" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/config" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/filestore" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store/storetest" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) func newServerWithConfig(t *testing.T, f func(cfg *model.Config)) (*Server, error) { diff --git a/app/session.go b/app/session.go index fd7c77ed90..589d44c050 100644 --- a/app/session.go +++ b/app/session.go @@ -10,11 +10,11 @@ import ( "net/http" "os" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/users" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/users" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) func (a *App) CreateSession(session *model.Session) (*model.Session, *model.AppError) { diff --git a/app/session_test.go b/app/session_test.go index 7e0f313950..77629a970b 100644 --- a/app/session_test.go +++ b/app/session_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestGetSessionIdleTimeoutInMinutes(t *testing.T) { diff --git a/app/shared_channel.go b/app/shared_channel.go index 6961ecae18..1101eb8d2c 100644 --- a/app/shared_channel.go +++ b/app/shared_channel.go @@ -8,8 +8,8 @@ import ( "fmt" "net/http" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func (a *App) checkChannelNotShared(channelId string) error { diff --git a/app/shared_channel_notifier.go b/app/shared_channel_notifier.go index 3acddc3d73..59aaefb1b8 100644 --- a/app/shared_channel_notifier.go +++ b/app/shared_channel_notifier.go @@ -9,9 +9,9 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/sharedchannel" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/sharedchannel" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) var sharedChannelEventsForSync model.StringArray = []string{ diff --git a/app/shared_channel_notifier_test.go b/app/shared_channel_notifier_test.go index 3fe6bee217..1199f09075 100644 --- a/app/shared_channel_notifier_test.go +++ b/app/shared_channel_notifier_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestServerSyncSharedChannelHandler(t *testing.T) { diff --git a/app/shared_channel_service_iface.go b/app/shared_channel_service_iface.go index a6fffe332b..4df47fce08 100644 --- a/app/shared_channel_service_iface.go +++ b/app/shared_channel_service_iface.go @@ -4,8 +4,8 @@ package app import ( - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/sharedchannel" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/sharedchannel" ) // SharedChannelServiceIFace is the interface to the shared channel service diff --git a/app/shared_channel_test.go b/app/shared_channel_test.go index 907983a3b7..f2674980e0 100644 --- a/app/shared_channel_test.go +++ b/app/shared_channel_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestApp_CheckCanInviteToSharedChannel(t *testing.T) { diff --git a/app/slack.go b/app/slack.go index 627546355e..f850c90e61 100644 --- a/app/slack.go +++ b/app/slack.go @@ -13,10 +13,10 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/slackimport" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/slackimport" + "github.com/mattermost/mattermost-server/v6/store" ) func (a *App) SlackImport(c *request.Context, fileData multipart.File, fileSize int64, teamID string) (*model.AppError, *bytes.Buffer) { diff --git a/app/slack_test.go b/app/slack_test.go index e016fa9512..e82eb097f1 100644 --- a/app/slack_test.go +++ b/app/slack_test.go @@ -6,7 +6,7 @@ package app import ( "testing" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestProcessSlackText(t *testing.T) { diff --git a/app/slashcommands/auto_channels.go b/app/slashcommands/auto_channels.go index cbc10cbe94..c8b5c8b920 100644 --- a/app/slashcommands/auto_channels.go +++ b/app/slashcommands/auto_channels.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/utils" ) type AutoChannelCreator struct { diff --git a/app/slashcommands/auto_constants.go b/app/slashcommands/auto_constants.go index 114633ffd1..d6b1bc1cd1 100644 --- a/app/slashcommands/auto_constants.go +++ b/app/slashcommands/auto_constants.go @@ -4,8 +4,8 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/utils" ) const ( diff --git a/app/slashcommands/auto_environment.go b/app/slashcommands/auto_environment.go index 8e28317443..f6f5ac69c5 100644 --- a/app/slashcommands/auto_environment.go +++ b/app/slashcommands/auto_environment.go @@ -7,10 +7,10 @@ import ( "math/rand" "time" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/utils" ) type TestEnvironment struct { diff --git a/app/slashcommands/auto_posts.go b/app/slashcommands/auto_posts.go index 979f9d050d..db19b7ecfd 100644 --- a/app/slashcommands/auto_posts.go +++ b/app/slashcommands/auto_posts.go @@ -9,11 +9,11 @@ import ( "os" "path/filepath" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/utils" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/utils" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) type AutoPostCreator struct { diff --git a/app/slashcommands/auto_teams.go b/app/slashcommands/auto_teams.go index 98f0607bb9..86cbd75caf 100644 --- a/app/slashcommands/auto_teams.go +++ b/app/slashcommands/auto_teams.go @@ -4,8 +4,8 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/utils" ) type TeamEnvironment struct { diff --git a/app/slashcommands/auto_users.go b/app/slashcommands/auto_users.go index 7a3f79cba8..6c003a8fdc 100644 --- a/app/slashcommands/auto_users.go +++ b/app/slashcommands/auto_users.go @@ -7,11 +7,11 @@ import ( "errors" "net/http" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "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/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/utils" ) type AutoUserCreator struct { diff --git a/app/slashcommands/command_away.go b/app/slashcommands/command_away.go index 9153940bf7..c49877031b 100644 --- a/app/slashcommands/command_away.go +++ b/app/slashcommands/command_away.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) type AwayProvider struct { diff --git a/app/slashcommands/command_channel_header.go b/app/slashcommands/command_channel_header.go index 3ff4169432..24a8acb884 100644 --- a/app/slashcommands/command_channel_header.go +++ b/app/slashcommands/command_channel_header.go @@ -6,10 +6,10 @@ package slashcommands import ( "context" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) type HeaderProvider struct { diff --git a/app/slashcommands/command_channel_header_test.go b/app/slashcommands/command_channel_header_test.go index bff1d1527e..5a6ec51fa5 100644 --- a/app/slashcommands/command_channel_header_test.go +++ b/app/slashcommands/command_channel_header_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestHeaderProviderDoCommand(t *testing.T) { diff --git a/app/slashcommands/command_channel_purpose.go b/app/slashcommands/command_channel_purpose.go index 8b3f52fabb..e51947039a 100644 --- a/app/slashcommands/command_channel_purpose.go +++ b/app/slashcommands/command_channel_purpose.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) type PurposeProvider struct { diff --git a/app/slashcommands/command_channel_purpose_test.go b/app/slashcommands/command_channel_purpose_test.go index 81d0fd39da..d03b647ac5 100644 --- a/app/slashcommands/command_channel_purpose_test.go +++ b/app/slashcommands/command_channel_purpose_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestPurposeProviderDoCommand(t *testing.T) { diff --git a/app/slashcommands/command_channel_rename.go b/app/slashcommands/command_channel_rename.go index 43036d2491..bf892374ec 100644 --- a/app/slashcommands/command_channel_rename.go +++ b/app/slashcommands/command_channel_rename.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) type RenameProvider struct { diff --git a/app/slashcommands/command_channel_rename_test.go b/app/slashcommands/command_channel_rename_test.go index b0ebacaca4..eb6097450b 100644 --- a/app/slashcommands/command_channel_rename_test.go +++ b/app/slashcommands/command_channel_rename_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestRenameProviderDoCommand(t *testing.T) { diff --git a/app/slashcommands/command_code.go b/app/slashcommands/command_code.go index 37cdc10e6d..0add5d18ee 100644 --- a/app/slashcommands/command_code.go +++ b/app/slashcommands/command_code.go @@ -6,10 +6,10 @@ package slashcommands import ( "strings" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) type CodeProvider struct { diff --git a/app/slashcommands/command_code_test.go b/app/slashcommands/command_code_test.go index d331a1977a..732b3bef0a 100644 --- a/app/slashcommands/command_code_test.go +++ b/app/slashcommands/command_code_test.go @@ -6,7 +6,7 @@ package slashcommands import ( "testing" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestCodeProviderDoCommand(t *testing.T) { diff --git a/app/slashcommands/command_custom_status.go b/app/slashcommands/command_custom_status.go index 7a86eae071..a75fbcbf65 100644 --- a/app/slashcommands/command_custom_status.go +++ b/app/slashcommands/command_custom_status.go @@ -8,11 +8,11 @@ import ( "strings" "unicode/utf8" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) type CustomStatusProvider struct { diff --git a/app/slashcommands/command_custom_status_test.go b/app/slashcommands/command_custom_status_test.go index 3bb4f6575f..560ba2e181 100644 --- a/app/slashcommands/command_custom_status_test.go +++ b/app/slashcommands/command_custom_status_test.go @@ -6,7 +6,7 @@ package slashcommands import ( "testing" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestGetCustomStatus(t *testing.T) { diff --git a/app/slashcommands/command_dnd.go b/app/slashcommands/command_dnd.go index 2dc92ab4a8..7a2d4aa01f 100644 --- a/app/slashcommands/command_dnd.go +++ b/app/slashcommands/command_dnd.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) type DndProvider struct { diff --git a/app/slashcommands/command_echo.go b/app/slashcommands/command_echo.go index 8ac6c34c3b..e92176dff5 100644 --- a/app/slashcommands/command_echo.go +++ b/app/slashcommands/command_echo.go @@ -8,11 +8,11 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) var echoSem chan bool diff --git a/app/slashcommands/command_expand_collapse.go b/app/slashcommands/command_expand_collapse.go index 66aee356dd..a4b75c759d 100644 --- a/app/slashcommands/command_expand_collapse.go +++ b/app/slashcommands/command_expand_collapse.go @@ -6,10 +6,10 @@ package slashcommands import ( "strconv" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) type ExpandProvider struct { diff --git a/app/slashcommands/command_groupmsg.go b/app/slashcommands/command_groupmsg.go index d00a223e78..8ecf74da46 100644 --- a/app/slashcommands/command_groupmsg.go +++ b/app/slashcommands/command_groupmsg.go @@ -7,11 +7,11 @@ import ( "fmt" "strings" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) type groupmsgProvider struct { diff --git a/app/slashcommands/command_groupmsg_test.go b/app/slashcommands/command_groupmsg_test.go index 8097a0636c..3e8887fc85 100644 --- a/app/slashcommands/command_groupmsg_test.go +++ b/app/slashcommands/command_groupmsg_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) func TestGroupMsgUsernames(t *testing.T) { diff --git a/app/slashcommands/command_help.go b/app/slashcommands/command_help.go index 6e92ef2af7..2e627be706 100644 --- a/app/slashcommands/command_help.go +++ b/app/slashcommands/command_help.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) type HelpProvider struct { diff --git a/app/slashcommands/command_invite.go b/app/slashcommands/command_invite.go index 6eddb3fba6..a6b0625b76 100644 --- a/app/slashcommands/command_invite.go +++ b/app/slashcommands/command_invite.go @@ -7,11 +7,11 @@ import ( "context" "strings" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) type InviteProvider struct { diff --git a/app/slashcommands/command_invite_people.go b/app/slashcommands/command_invite_people.go index 10c7529e86..6ec723f6f2 100644 --- a/app/slashcommands/command_invite_people.go +++ b/app/slashcommands/command_invite_people.go @@ -6,11 +6,11 @@ package slashcommands import ( "strings" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) type InvitePeopleProvider struct { diff --git a/app/slashcommands/command_invite_people_test.go b/app/slashcommands/command_invite_people_test.go index 7eb1db7105..0a13e7b433 100644 --- a/app/slashcommands/command_invite_people_test.go +++ b/app/slashcommands/command_invite_people_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestInvitePeopleProvider(t *testing.T) { diff --git a/app/slashcommands/command_invite_test.go b/app/slashcommands/command_invite_test.go index 25712a14c1..b792cf8807 100644 --- a/app/slashcommands/command_invite_test.go +++ b/app/slashcommands/command_invite_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/model" ) func TestInviteProvider(t *testing.T) { diff --git a/app/slashcommands/command_join.go b/app/slashcommands/command_join.go index 0391d14fe0..dd70bed6c0 100644 --- a/app/slashcommands/command_join.go +++ b/app/slashcommands/command_join.go @@ -6,10 +6,10 @@ package slashcommands import ( "strings" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) type JoinProvider struct { diff --git a/app/slashcommands/command_join_test.go b/app/slashcommands/command_join_test.go index 13557932ea..0ec98ea2aa 100644 --- a/app/slashcommands/command_join_test.go +++ b/app/slashcommands/command_join_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) func TestJoinCommandNoChannel(t *testing.T) { diff --git a/app/slashcommands/command_leave.go b/app/slashcommands/command_leave.go index 39c696d41a..c01abf3942 100644 --- a/app/slashcommands/command_leave.go +++ b/app/slashcommands/command_leave.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) type LeaveProvider struct { diff --git a/app/slashcommands/command_leave_test.go b/app/slashcommands/command_leave_test.go index 4b30d72058..c883f418c3 100644 --- a/app/slashcommands/command_leave_test.go +++ b/app/slashcommands/command_leave_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestLeaveProviderDoCommand(t *testing.T) { diff --git a/app/slashcommands/command_loadtest.go b/app/slashcommands/command_loadtest.go index 59b670b7ff..c39ce0bbb8 100644 --- a/app/slashcommands/command_loadtest.go +++ b/app/slashcommands/command_loadtest.go @@ -14,12 +14,12 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/utils" ) var usage = `Mattermost testing commands to help configure the system diff --git a/app/slashcommands/command_logout.go b/app/slashcommands/command_logout.go index caeb0d019d..645a8534a3 100644 --- a/app/slashcommands/command_logout.go +++ b/app/slashcommands/command_logout.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) type LogoutProvider struct { diff --git a/app/slashcommands/command_me.go b/app/slashcommands/command_me.go index eab9e20749..a6f3a2db37 100644 --- a/app/slashcommands/command_me.go +++ b/app/slashcommands/command_me.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) type MeProvider struct { diff --git a/app/slashcommands/command_me_test.go b/app/slashcommands/command_me_test.go index 1c19a358a5..20472e745b 100644 --- a/app/slashcommands/command_me_test.go +++ b/app/slashcommands/command_me_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestMeProviderDoCommand(t *testing.T) { diff --git a/app/slashcommands/command_msg.go b/app/slashcommands/command_msg.go index b9345a7b43..e64379ee23 100644 --- a/app/slashcommands/command_msg.go +++ b/app/slashcommands/command_msg.go @@ -7,12 +7,12 @@ import ( "errors" "strings" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) type msgProvider struct { diff --git a/app/slashcommands/command_msg_test.go b/app/slashcommands/command_msg_test.go index 05e21ba9c9..851c712125 100644 --- a/app/slashcommands/command_msg_test.go +++ b/app/slashcommands/command_msg_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) func TestMsgProvider(t *testing.T) { diff --git a/app/slashcommands/command_mute.go b/app/slashcommands/command_mute.go index e681ed2a91..6b2c19e54c 100644 --- a/app/slashcommands/command_mute.go +++ b/app/slashcommands/command_mute.go @@ -6,10 +6,10 @@ package slashcommands import ( "strings" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) type MuteProvider struct { diff --git a/app/slashcommands/command_mute_test.go b/app/slashcommands/command_mute_test.go index b7a6a3f0f6..921d519e83 100644 --- a/app/slashcommands/command_mute_test.go +++ b/app/slashcommands/command_mute_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) func TestMuteCommandNoChannel(t *testing.T) { diff --git a/app/slashcommands/command_offline.go b/app/slashcommands/command_offline.go index bf56721328..f89cb85c3f 100644 --- a/app/slashcommands/command_offline.go +++ b/app/slashcommands/command_offline.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) type OfflineProvider struct { diff --git a/app/slashcommands/command_online.go b/app/slashcommands/command_online.go index 618520811d..ab43cb07b5 100644 --- a/app/slashcommands/command_online.go +++ b/app/slashcommands/command_online.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) type OnlineProvider struct { diff --git a/app/slashcommands/command_open.go b/app/slashcommands/command_open.go index 3b41daf261..c8b83841e9 100644 --- a/app/slashcommands/command_open.go +++ b/app/slashcommands/command_open.go @@ -4,9 +4,9 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) type OpenProvider struct { diff --git a/app/slashcommands/command_remote.go b/app/slashcommands/command_remote.go index 4655cca82e..90ce6d8e8c 100644 --- a/app/slashcommands/command_remote.go +++ b/app/slashcommands/command_remote.go @@ -9,10 +9,10 @@ import ( "fmt" "strings" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) const ( diff --git a/app/slashcommands/command_remove.go b/app/slashcommands/command_remove.go index ceb394a4f8..e98a6c64bf 100644 --- a/app/slashcommands/command_remove.go +++ b/app/slashcommands/command_remove.go @@ -7,11 +7,11 @@ import ( "context" "strings" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) type RemoveProvider struct { diff --git a/app/slashcommands/command_remove_test.go b/app/slashcommands/command_remove_test.go index 7c28be69b9..9e775ee784 100644 --- a/app/slashcommands/command_remove_test.go +++ b/app/slashcommands/command_remove_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestRemoveProviderDoCommand(t *testing.T) { diff --git a/app/slashcommands/command_search.go b/app/slashcommands/command_search.go index 2b5c142223..2bc8dc3644 100644 --- a/app/slashcommands/command_search.go +++ b/app/slashcommands/command_search.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) type SearchProvider struct { diff --git a/app/slashcommands/command_settings.go b/app/slashcommands/command_settings.go index 7d33bc81e8..7904be535c 100644 --- a/app/slashcommands/command_settings.go +++ b/app/slashcommands/command_settings.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) type SettingsProvider struct { diff --git a/app/slashcommands/command_share.go b/app/slashcommands/command_share.go index 18ada56b22..30fa0d40d8 100644 --- a/app/slashcommands/command_share.go +++ b/app/slashcommands/command_share.go @@ -8,10 +8,10 @@ import ( "fmt" "strings" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) type ShareProvider struct { diff --git a/app/slashcommands/command_share_test.go b/app/slashcommands/command_share_test.go index 89d9a91657..cd01fce0cc 100644 --- a/app/slashcommands/command_share_test.go +++ b/app/slashcommands/command_share_test.go @@ -9,14 +9,14 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v5/testlib" + "github.com/mattermost/mattermost-server/v6/testlib" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/services/remotecluster" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/services/remotecluster" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestShareProviderDoCommand(t *testing.T) { diff --git a/app/slashcommands/command_shortcuts.go b/app/slashcommands/command_shortcuts.go index dd15b960d5..a4f06b028b 100644 --- a/app/slashcommands/command_shortcuts.go +++ b/app/slashcommands/command_shortcuts.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) type ShortcutsProvider struct { diff --git a/app/slashcommands/command_shrug.go b/app/slashcommands/command_shrug.go index 10430d5951..13a9654876 100644 --- a/app/slashcommands/command_shrug.go +++ b/app/slashcommands/command_shrug.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) type ShrugProvider struct { diff --git a/app/slashcommands/command_test.go b/app/slashcommands/command_test.go index b5feced842..401bde2a65 100644 --- a/app/slashcommands/command_test.go +++ b/app/slashcommands/command_test.go @@ -16,8 +16,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/httpservice" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/httpservice" ) type InfiniteReader struct { diff --git a/app/slashcommands/helper_test.go b/app/slashcommands/helper_test.go index 3248701abe..57faf1c805 100644 --- a/app/slashcommands/helper_test.go +++ b/app/slashcommands/helper_test.go @@ -14,14 +14,14 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/config" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" - "github.com/mattermost/mattermost-server/v5/store/localcachelayer" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/config" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/store/localcachelayer" + "github.com/mattermost/mattermost-server/v6/utils" ) type TestHelper struct { diff --git a/app/slashcommands/main_test.go b/app/slashcommands/main_test.go index d030366fdc..97029616bf 100644 --- a/app/slashcommands/main_test.go +++ b/app/slashcommands/main_test.go @@ -6,8 +6,8 @@ package slashcommands import ( "testing" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/testlib" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/testlib" ) var mainHelper *testlib.MainHelper diff --git a/app/slashcommands/util.go b/app/slashcommands/util.go index 5d4268a22c..dc59fb7278 100644 --- a/app/slashcommands/util.go +++ b/app/slashcommands/util.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) const ( diff --git a/app/status.go b/app/status.go index c7beb5153e..f3a0b5c78d 100644 --- a/app/status.go +++ b/app/status.go @@ -8,9 +8,9 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) func (a *App) AddStatusCacheSkipClusterSend(status *model.Status) { diff --git a/app/status_test.go b/app/status_test.go index 589e5b81d1..d2d8c0e7dd 100644 --- a/app/status_test.go +++ b/app/status_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestSaveStatus(t *testing.T) { diff --git a/app/syncables.go b/app/syncables.go index eab37e3b03..731aceb982 100644 --- a/app/syncables.go +++ b/app/syncables.go @@ -8,9 +8,9 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) // createDefaultChannelMemberships adds users to channels based on their group memberships and how those groups are diff --git a/app/syncables_test.go b/app/syncables_test.go index 1000d7c55c..416b227eff 100644 --- a/app/syncables_test.go +++ b/app/syncables_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestCreateDefaultMemberships(t *testing.T) { diff --git a/app/team.go b/app/team.go index a47a99d63d..4119dc689d 100644 --- a/app/team.go +++ b/app/team.go @@ -15,16 +15,16 @@ import ( "net/url" "strings" - "github.com/mattermost/mattermost-server/v5/app/email" - "github.com/mattermost/mattermost-server/v5/app/imaging" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/services/users" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" - "github.com/mattermost/mattermost-server/v5/store/sqlstore" + "github.com/mattermost/mattermost-server/v6/app/email" + "github.com/mattermost/mattermost-server/v6/app/imaging" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/services/users" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/store/sqlstore" ) func (a *App) CreateTeam(c *request.Context, team *model.Team) (*model.Team, *model.AppError) { diff --git a/app/team_test.go b/app/team_test.go index 67f3d9e7bf..7ecd71dda7 100644 --- a/app/team_test.go +++ b/app/team_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) func TestCreateTeam(t *testing.T) { diff --git a/app/terms_of_service.go b/app/terms_of_service.go index ebfb0cec92..98db3341ba 100644 --- a/app/terms_of_service.go +++ b/app/terms_of_service.go @@ -7,8 +7,8 @@ import ( "errors" "net/http" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func (a *App) CreateTermsOfService(text, userID string) (*model.TermsOfService, *model.AppError) { diff --git a/app/upload.go b/app/upload.go index 0ff12f9c43..a8a3dce8ac 100644 --- a/app/upload.go +++ b/app/upload.go @@ -12,11 +12,11 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) const minFirstPartSize = 5 * 1024 * 1024 // 5MB diff --git a/app/upload_test.go b/app/upload_test.go index 74e0c99da1..26530f2b3a 100644 --- a/app/upload_test.go +++ b/app/upload_test.go @@ -15,8 +15,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) func TestCreateUploadSession(t *testing.T) { diff --git a/app/user.go b/app/user.go index 7ff114fa4d..c5289d4878 100644 --- a/app/user.go +++ b/app/user.go @@ -15,17 +15,17 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v5/app/email" - "github.com/mattermost/mattermost-server/v5/app/imaging" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/einterfaces" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" - "github.com/mattermost/mattermost-server/v5/services/users" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mfa" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/app/email" + "github.com/mattermost/mattermost-server/v6/app/imaging" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/services/users" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mfa" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) const ( diff --git a/app/user_terms_of_service.go b/app/user_terms_of_service.go index 2a7af92053..d1e3eef45e 100644 --- a/app/user_terms_of_service.go +++ b/app/user_terms_of_service.go @@ -7,8 +7,8 @@ import ( "errors" "net/http" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func (a *App) GetUserTermsOfService(userID string) (*model.UserTermsOfService, *model.AppError) { diff --git a/app/user_test.go b/app/user_test.go index 3e03146747..f936507881 100644 --- a/app/user_test.go +++ b/app/user_test.go @@ -17,13 +17,13 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/einterfaces" - "github.com/mattermost/mattermost-server/v5/einterfaces/mocks" - "github.com/mattermost/mattermost-server/v5/model" - oauthgitlab "github.com/mattermost/mattermost-server/v5/model/gitlab" - "github.com/mattermost/mattermost-server/v5/store" - "github.com/mattermost/mattermost-server/v5/utils/testutils" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/einterfaces/mocks" + "github.com/mattermost/mattermost-server/v6/model" + oauthgitlab "github.com/mattermost/mattermost-server/v6/model/gitlab" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/utils/testutils" ) func TestCreateOAuthUser(t *testing.T) { diff --git a/app/user_viewmembers_test.go b/app/user_viewmembers_test.go index c24db42b7d..3c5a22fb1b 100644 --- a/app/user_viewmembers_test.go +++ b/app/user_viewmembers_test.go @@ -9,8 +9,8 @@ import ( "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func TestResctrictedViewMembers(t *testing.T) { diff --git a/app/web_conn.go b/app/web_conn.go index 3a6fecb63d..2489a11f43 100644 --- a/app/web_conn.go +++ b/app/web_conn.go @@ -17,9 +17,9 @@ import ( "github.com/gorilla/websocket" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const ( diff --git a/app/web_conn_test.go b/app/web_conn_test.go index 8efe10a58b..5917b73af6 100644 --- a/app/web_conn_test.go +++ b/app/web_conn_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) func TestWebConnShouldSendEvent(t *testing.T) { diff --git a/app/web_hub.go b/app/web_hub.go index b714f2d95f..be5fd205ff 100644 --- a/app/web_hub.go +++ b/app/web_hub.go @@ -11,8 +11,8 @@ import ( "sync/atomic" "time" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const ( diff --git a/app/web_hub_test.go b/app/web_hub_test.go index d15b758f51..ef949c3412 100644 --- a/app/web_hub_test.go +++ b/app/web_hub_test.go @@ -15,10 +15,10 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/users" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/users" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) func dummyWebsocketHandler(t *testing.T) http.HandlerFunc { diff --git a/app/webhook.go b/app/webhook.go index 729a5f5286..ab5d679327 100644 --- a/app/webhook.go +++ b/app/webhook.go @@ -12,11 +12,11 @@ import ( "strings" "unicode/utf8" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/utils" ) const ( diff --git a/app/webhook_test.go b/app/webhook_test.go index ec488137a3..265cef1841 100644 --- a/app/webhook_test.go +++ b/app/webhook_test.go @@ -16,8 +16,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/httpservice" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/httpservice" ) func TestCreateIncomingWebhookForChannel(t *testing.T) { diff --git a/app/webhub_fuzz.go b/app/webhub_fuzz.go index 45dbf69fea..ea5a1a5f26 100644 --- a/app/webhub_fuzz.go +++ b/app/webhub_fuzz.go @@ -18,9 +18,9 @@ import ( "github.com/gorilla/websocket" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/testlib" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/testlib" ) // This is a file used to fuzz test the web_hub code. @@ -41,7 +41,7 @@ import ( // 1. go get -u github.com/dvyukov/go-fuzz/go-fuzz github.com/dvyukov/go-fuzz/go-fuzz-build // 2. mv app/helper_test.go app/helper.go // (Also reduce the number of push notification workers to 1 to debug stack traces easily.) -// 3. go-fuzz-build github.com/mattermost/mattermost-server/v5/app +// 3. go-fuzz-build github.com/mattermost/mattermost-server/v6/app // 4. Generate a corpus dir. It's just a directory with files containing random data // for go-fuzz to use as an initial seed. Use the generateInitialCorpus function for that. // 5. go-fuzz -bin=app-fuzz.zip -workdir=./workdir diff --git a/app/websocket_router.go b/app/websocket_router.go index e76d222288..8a662d5731 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/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) type webSocketHandler interface { diff --git a/audit/audit.go b/audit/audit.go index 2d48e06eb7..c63935f6f3 100644 --- a/audit/audit.go +++ b/audit/audit.go @@ -10,7 +10,7 @@ import ( "github.com/mattermost/logr" "github.com/mattermost/logr/format" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) type Audit struct { diff --git a/cmd/mattermost/commands/channel.go b/cmd/mattermost/commands/channel.go index fd8d3d2f5a..39e5c5dcdd 100644 --- a/cmd/mattermost/commands/channel.go +++ b/cmd/mattermost/commands/channel.go @@ -9,10 +9,10 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) var ChannelCmd = &cobra.Command{ diff --git a/cmd/mattermost/commands/channel_test.go b/cmd/mattermost/commands/channel_test.go index 02c5824b51..662d567989 100644 --- a/cmd/mattermost/commands/channel_test.go +++ b/cmd/mattermost/commands/channel_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestJoinChannel(t *testing.T) { diff --git a/cmd/mattermost/commands/channelargs.go b/cmd/mattermost/commands/channelargs.go index bbbc6d4eec..4cca9a8c68 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/v5/app" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/model" ) const ChannelArgSeparator = ":" diff --git a/cmd/mattermost/commands/cmdtestlib.go b/cmd/mattermost/commands/cmdtestlib.go index 3f202a1feb..5dc8b34dcd 100644 --- a/cmd/mattermost/commands/cmdtestlib.go +++ b/cmd/mattermost/commands/cmdtestlib.go @@ -17,10 +17,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/api4" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v5/testlib" + "github.com/mattermost/mattermost-server/v6/api4" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v6/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 867941b87c..93077f0198 100644 --- a/cmd/mattermost/commands/command.go +++ b/cmd/mattermost/commands/command.go @@ -10,9 +10,9 @@ import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) var CommandCmd = &cobra.Command{ diff --git a/cmd/mattermost/commands/command_test.go b/cmd/mattermost/commands/command_test.go index e8cdd5d63d..0ce9629396 100644 --- a/cmd/mattermost/commands/command_test.go +++ b/cmd/mattermost/commands/command_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestCreateCommand(t *testing.T) { diff --git a/cmd/mattermost/commands/commandargs.go b/cmd/mattermost/commands/commandargs.go index 49c59ab257..f15f39c9a5 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/v5/app" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/model" ) const CommandArgsSeparator = ":" diff --git a/cmd/mattermost/commands/config.go b/cmd/mattermost/commands/config.go index e2674da831..7c2df15269 100644 --- a/cmd/mattermost/commands/config.go +++ b/cmd/mattermost/commands/config.go @@ -14,12 +14,12 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/config" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/config" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/utils" ) const noSettingsNamed = "unable to find a setting named: %s" diff --git a/cmd/mattermost/commands/config_test.go b/cmd/mattermost/commands/config_test.go index 7566f213e0..043b2702d7 100644 --- a/cmd/mattermost/commands/config_test.go +++ b/cmd/mattermost/commands/config_test.go @@ -15,8 +15,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/config" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/config" + "github.com/mattermost/mattermost-server/v6/model" ) type TestConfig struct { diff --git a/cmd/mattermost/commands/db.go b/cmd/mattermost/commands/db.go index cc8a9ba126..1af025bec3 100644 --- a/cmd/mattermost/commands/db.go +++ b/cmd/mattermost/commands/db.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v5/config" - "github.com/mattermost/mattermost-server/v5/store/sqlstore" + "github.com/mattermost/mattermost-server/v6/config" + "github.com/mattermost/mattermost-server/v6/store/sqlstore" ) var DbCmd = &cobra.Command{ diff --git a/cmd/mattermost/commands/export.go b/cmd/mattermost/commands/export.go index f84134e95c..62e15da920 100644 --- a/cmd/mattermost/commands/export.go +++ b/cmd/mattermost/commands/export.go @@ -10,9 +10,9 @@ import ( "path/filepath" "time" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/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 f4d5355b34..f6ebfeffb6 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/v5/model" + "github.com/mattermost/mattermost-server/v6/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/extract_content.go b/cmd/mattermost/commands/extract_content.go index a843555be7..8f5ca69a60 100644 --- a/cmd/mattermost/commands/extract_content.go +++ b/cmd/mattermost/commands/extract_content.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) var ExtractContentCmd = &cobra.Command{ diff --git a/cmd/mattermost/commands/group.go b/cmd/mattermost/commands/group.go index 238128a23c..1b6103ea1d 100644 --- a/cmd/mattermost/commands/group.go +++ b/cmd/mattermost/commands/group.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) var GroupCmd = &cobra.Command{ diff --git a/cmd/mattermost/commands/group_test.go b/cmd/mattermost/commands/group_test.go index f1444d6bf7..61cb88c407 100644 --- a/cmd/mattermost/commands/group_test.go +++ b/cmd/mattermost/commands/group_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestChannelGroupEnable(t *testing.T) { diff --git a/cmd/mattermost/commands/import.go b/cmd/mattermost/commands/import.go index f51775ecaf..8ef07bbe53 100644 --- a/cmd/mattermost/commands/import.go +++ b/cmd/mattermost/commands/import.go @@ -10,8 +10,8 @@ import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/audit" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/audit" ) var ImportCmd = &cobra.Command{ diff --git a/cmd/mattermost/commands/init.go b/cmd/mattermost/commands/init.go index d304e48d53..405ed79c9f 100644 --- a/cmd/mattermost/commands/init.go +++ b/cmd/mattermost/commands/init.go @@ -6,12 +6,12 @@ package commands import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/config" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/config" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/utils" ) func initDBCommandContextCobra(command *cobra.Command, readOnlyConfigStore bool) (*app.App, error) { diff --git a/cmd/mattermost/commands/integrity.go b/cmd/mattermost/commands/integrity.go index 5cf603b1ad..30157b735a 100644 --- a/cmd/mattermost/commands/integrity.go +++ b/cmd/mattermost/commands/integrity.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) var IntegrityCmd = &cobra.Command{ diff --git a/cmd/mattermost/commands/jobserver.go b/cmd/mattermost/commands/jobserver.go index 92bbc90f11..488b3f8fe7 100644 --- a/cmd/mattermost/commands/jobserver.go +++ b/cmd/mattermost/commands/jobserver.go @@ -10,9 +10,9 @@ import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/config" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/config" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) var JobserverCmd = &cobra.Command{ diff --git a/cmd/mattermost/commands/ldap.go b/cmd/mattermost/commands/ldap.go index f3e5c5ab4e..10e086138f 100644 --- a/cmd/mattermost/commands/ldap.go +++ b/cmd/mattermost/commands/ldap.go @@ -6,8 +6,8 @@ package commands import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) var LdapCmd = &cobra.Command{ diff --git a/cmd/mattermost/commands/license.go b/cmd/mattermost/commands/license.go index 5395e2ffe2..c1edbab8e8 100644 --- a/cmd/mattermost/commands/license.go +++ b/cmd/mattermost/commands/license.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v5/audit" + "github.com/mattermost/mattermost-server/v6/audit" ) var LicenseCmd = &cobra.Command{ diff --git a/cmd/mattermost/commands/logs.go b/cmd/mattermost/commands/logs.go index d19d3a6735..bab0a12e6b 100644 --- a/cmd/mattermost/commands/logs.go +++ b/cmd/mattermost/commands/logs.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v5/shared/mlog/human" + "github.com/mattermost/mattermost-server/v6/shared/mlog/human" ) var LogsCmd = &cobra.Command{ diff --git a/cmd/mattermost/commands/main_test.go b/cmd/mattermost/commands/main_test.go index 78545fbf09..0905703763 100644 --- a/cmd/mattermost/commands/main_test.go +++ b/cmd/mattermost/commands/main_test.go @@ -8,9 +8,9 @@ import ( "os" "testing" - "github.com/mattermost/mattermost-server/v5/api4" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/testlib" + "github.com/mattermost/mattermost-server/v6/api4" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/testlib" ) func TestMain(m *testing.M) { diff --git a/cmd/mattermost/commands/permissions.go b/cmd/mattermost/commands/permissions.go index fd11b36c17..3860ed9c2a 100644 --- a/cmd/mattermost/commands/permissions.go +++ b/cmd/mattermost/commands/permissions.go @@ -10,8 +10,8 @@ import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) var PermissionsCmd = &cobra.Command{ diff --git a/cmd/mattermost/commands/permissions_test.go b/cmd/mattermost/commands/permissions_test.go index 1e0740026f..dca6bc3230 100644 --- a/cmd/mattermost/commands/permissions_test.go +++ b/cmd/mattermost/commands/permissions_test.go @@ -6,7 +6,7 @@ package commands import ( "testing" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/i18n" "github.com/stretchr/testify/assert" ) diff --git a/cmd/mattermost/commands/plugin.go b/cmd/mattermost/commands/plugin.go index 92b9136fda..82708b982e 100644 --- a/cmd/mattermost/commands/plugin.go +++ b/cmd/mattermost/commands/plugin.go @@ -11,8 +11,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) var PluginCmd = &cobra.Command{ diff --git a/cmd/mattermost/commands/plugin_test.go b/cmd/mattermost/commands/plugin_test.go index 4e2248e3df..fd52b99e50 100644 --- a/cmd/mattermost/commands/plugin_test.go +++ b/cmd/mattermost/commands/plugin_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/config" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/config" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) func TestPlugin(t *testing.T) { diff --git a/cmd/mattermost/commands/reset.go b/cmd/mattermost/commands/reset.go index e8e9c21ce0..212ecf54ac 100644 --- a/cmd/mattermost/commands/reset.go +++ b/cmd/mattermost/commands/reset.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v5/audit" + "github.com/mattermost/mattermost-server/v6/audit" ) var ResetCmd = &cobra.Command{ diff --git a/cmd/mattermost/commands/roles.go b/cmd/mattermost/commands/roles.go index 84ea39dc4a..70b4323a98 100644 --- a/cmd/mattermost/commands/roles.go +++ b/cmd/mattermost/commands/roles.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) var RolesCmd = &cobra.Command{ diff --git a/cmd/mattermost/commands/sampledata.go b/cmd/mattermost/commands/sampledata.go index 367ac2d31d..1723735ab1 100644 --- a/cmd/mattermost/commands/sampledata.go +++ b/cmd/mattermost/commands/sampledata.go @@ -18,11 +18,11 @@ import ( "github.com/icrowley/fake" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/utils" ) const ( diff --git a/cmd/mattermost/commands/server.go b/cmd/mattermost/commands/server.go index 011c5ce99e..c4fca1a094 100644 --- a/cmd/mattermost/commands/server.go +++ b/cmd/mattermost/commands/server.go @@ -15,14 +15,14 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "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/shared/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/mattermost-server/v6/api4" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/config" + "github.com/mattermost/mattermost-server/v6/manualtesting" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/utils" + "github.com/mattermost/mattermost-server/v6/web" + "github.com/mattermost/mattermost-server/v6/wsapi" ) var serverCmd = &cobra.Command{ diff --git a/cmd/mattermost/commands/server_test.go b/cmd/mattermost/commands/server_test.go index 5345572fd4..a8dfc92477 100644 --- a/cmd/mattermost/commands/server_test.go +++ b/cmd/mattermost/commands/server_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/config" - "github.com/mattermost/mattermost-server/v5/jobs" + "github.com/mattermost/mattermost-server/v6/config" + "github.com/mattermost/mattermost-server/v6/jobs" ) const ( diff --git a/cmd/mattermost/commands/team.go b/cmd/mattermost/commands/team.go index 7f0ed7163f..780f358c6f 100644 --- a/cmd/mattermost/commands/team.go +++ b/cmd/mattermost/commands/team.go @@ -11,10 +11,10 @@ import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" ) var TeamCmd = &cobra.Command{ diff --git a/cmd/mattermost/commands/team_test.go b/cmd/mattermost/commands/team_test.go index d2b5540d1a..2370dce109 100644 --- a/cmd/mattermost/commands/team_test.go +++ b/cmd/mattermost/commands/team_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestCreateTeam(t *testing.T) { diff --git a/cmd/mattermost/commands/teamargs.go b/cmd/mattermost/commands/teamargs.go index de9d1e0bb9..d1858ca4e0 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/v5/app" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/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 cf48740171..5a3f87d28e 100644 --- a/cmd/mattermost/commands/test.go +++ b/cmd/mattermost/commands/test.go @@ -13,10 +13,10 @@ import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v5/api4" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/wsapi" + "github.com/mattermost/mattermost-server/v6/api4" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/wsapi" ) var TestCmd = &cobra.Command{ diff --git a/cmd/mattermost/commands/user.go b/cmd/mattermost/commands/user.go index 109ee58c9e..077d1e885f 100644 --- a/cmd/mattermost/commands/user.go +++ b/cmd/mattermost/commands/user.go @@ -12,11 +12,11 @@ import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/users" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/users" ) var UserCmd = &cobra.Command{ diff --git a/cmd/mattermost/commands/user_test.go b/cmd/mattermost/commands/user_test.go index ab15603648..44ad8f444d 100644 --- a/cmd/mattermost/commands/user_test.go +++ b/cmd/mattermost/commands/user_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestCreateUserWithTeam(t *testing.T) { diff --git a/cmd/mattermost/commands/userargs.go b/cmd/mattermost/commands/userargs.go index 745820aaa1..169be9abe7 100644 --- a/cmd/mattermost/commands/userargs.go +++ b/cmd/mattermost/commands/userargs.go @@ -6,8 +6,8 @@ package commands import ( "context" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/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 8493b1e95d..4425739111 100644 --- a/cmd/mattermost/commands/utils.go +++ b/cmd/mattermost/commands/utils.go @@ -14,8 +14,8 @@ import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const CustomDefaultsEnvVar = "MM_CUSTOM_DEFAULTS_PATH" diff --git a/cmd/mattermost/commands/version.go b/cmd/mattermost/commands/version.go index aaf1b89839..2bd7bf6751 100644 --- a/cmd/mattermost/commands/version.go +++ b/cmd/mattermost/commands/version.go @@ -6,8 +6,8 @@ package commands import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/model" ) var VersionCmd = &cobra.Command{ diff --git a/cmd/mattermost/commands/webhook.go b/cmd/mattermost/commands/webhook.go index 1997b17864..6e3c02a57b 100644 --- a/cmd/mattermost/commands/webhook.go +++ b/cmd/mattermost/commands/webhook.go @@ -11,9 +11,9 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) var WebhookCmd = &cobra.Command{ diff --git a/cmd/mattermost/commands/webhook_test.go b/cmd/mattermost/commands/webhook_test.go index 1911a0f837..84efa59378 100644 --- a/cmd/mattermost/commands/webhook_test.go +++ b/cmd/mattermost/commands/webhook_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/api4" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/api4" + "github.com/mattermost/mattermost-server/v6/model" ) func TestListWebhooks(t *testing.T) { diff --git a/cmd/mattermost/main.go b/cmd/mattermost/main.go index 2d7a307771..b2ce780367 100644 --- a/cmd/mattermost/main.go +++ b/cmd/mattermost/main.go @@ -18,13 +18,13 @@ import ( _ "github.com/tylerb/graceful" _ "gopkg.in/olivere/elastic.v6" - "github.com/mattermost/mattermost-server/v5/cmd/mattermost/commands" + "github.com/mattermost/mattermost-server/v6/cmd/mattermost/commands" // Import and register app layer slash commands - _ "github.com/mattermost/mattermost-server/v5/app/slashcommands" + _ "github.com/mattermost/mattermost-server/v6/app/slashcommands" // Plugins - _ "github.com/mattermost/mattermost-server/v5/model/gitlab" + _ "github.com/mattermost/mattermost-server/v6/model/gitlab" // Enterprise Imports - _ "github.com/mattermost/mattermost-server/v5/imports" + _ "github.com/mattermost/mattermost-server/v6/imports" ) func main() { diff --git a/config/client.go b/config/client.go index 2ef7b5a91e..211c098f3d 100644 --- a/config/client.go +++ b/config/client.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) // GenerateClientConfig renders the given configuration for a client. diff --git a/config/client_test.go b/config/client_test.go index cb7268a753..4d282a3b96 100644 --- a/config/client_test.go +++ b/config/client_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestGetClientConfig(t *testing.T) { diff --git a/config/common_test.go b/config/common_test.go index ee36d27faa..2efdb4851d 100644 --- a/config/common_test.go +++ b/config/common_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) var emptyConfig, readOnlyConfig, minimalConfig, minimalConfigNoFF, invalidConfig, fixesRequiredConfig, ldapConfig, testConfig, customConfigDefaults *model.Config diff --git a/config/database.go b/config/database.go index 6abfed7a15..713db4a1be 100644 --- a/config/database.go +++ b/config/database.go @@ -17,8 +17,8 @@ import ( // Load the Postgres driver _ "github.com/lib/pq" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) // MaxWriteLength defines the maximum length accepted for write to the Configurations or diff --git a/config/database_test.go b/config/database_test.go index 676391252f..ee81e04223 100644 --- a/config/database_test.go +++ b/config/database_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func getDsn(driver string, source string) string { diff --git a/config/diff.go b/config/diff.go index 2a6058774b..299472cab7 100644 --- a/config/diff.go +++ b/config/diff.go @@ -7,7 +7,7 @@ import ( "fmt" "reflect" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type ConfigDiffs []ConfigDiff diff --git a/config/diff_test.go b/config/diff_test.go index c1a9162890..f079a52802 100644 --- a/config/diff_test.go +++ b/config/diff_test.go @@ -6,7 +6,7 @@ package config import ( "testing" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" "github.com/stretchr/testify/require" ) diff --git a/config/emitter.go b/config/emitter.go index a058a497fb..9074868879 100644 --- a/config/emitter.go +++ b/config/emitter.go @@ -6,8 +6,8 @@ package config import ( "sync" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) // Listener is a callback function invoked when the configuration changes. diff --git a/config/emitter_test.go b/config/emitter_test.go index 3824a1f3a4..9906e851d3 100644 --- a/config/emitter_test.go +++ b/config/emitter_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) func TestEmitter(t *testing.T) { diff --git a/config/environment.go b/config/environment.go index 7adaa2de74..d6b68864c2 100644 --- a/config/environment.go +++ b/config/environment.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func GetEnvironment() map[string]string { diff --git a/config/environment_test.go b/config/environment_test.go index d93eb81e0a..d95c527435 100644 --- a/config/environment_test.go +++ b/config/environment_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func modifiedDefault(modify func(*model.Config)) *model.Config { diff --git a/config/file.go b/config/file.go index ce90bdc99e..3efe8a1ca0 100644 --- a/config/file.go +++ b/config/file.go @@ -11,9 +11,9 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) var ( diff --git a/config/file_test.go b/config/file_test.go index ef0f9b5568..3dd2f7d444 100644 --- a/config/file_test.go +++ b/config/file_test.go @@ -16,8 +16,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/utils" ) func setupConfigFile(t *testing.T, cfg *model.Config) (string, func()) { diff --git a/config/logging.go b/config/logging.go index dc79264e6a..60b67823e3 100644 --- a/config/logging.go +++ b/config/logging.go @@ -11,7 +11,7 @@ import ( "strings" "sync" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) type LogSrcListener func(old, new mlog.LogTargetCfg) diff --git a/config/main_test.go b/config/main_test.go index 293fb9e7eb..58e913108c 100644 --- a/config/main_test.go +++ b/config/main_test.go @@ -11,9 +11,9 @@ import ( "github.com/lib/pq" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/testlib" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/testlib" ) var mainHelper *testlib.MainHelper diff --git a/config/memory.go b/config/memory.go index c1a99a81ea..5d4f384d4a 100644 --- a/config/memory.go +++ b/config/memory.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) // MemoryStore implements the Store interface. It is meant primarily for testing. diff --git a/config/migrate_test.go b/config/migrate_test.go index ac2ac49b83..7b7f51c41b 100644 --- a/config/migrate_test.go +++ b/config/migrate_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type cleanUpFn func(store *Store) diff --git a/config/store.go b/config/store.go index ddd6d35849..29d03d9fbc 100644 --- a/config/store.go +++ b/config/store.go @@ -10,8 +10,8 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/utils/jsonutils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/utils/jsonutils" ) var ( diff --git a/config/utils.go b/config/utils.go index f146f41c11..328be92c28 100644 --- a/config/utils.go +++ b/config/utils.go @@ -10,10 +10,10 @@ import ( "reflect" "strings" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/utils" ) // marshalConfig converts the given configuration into JSON bytes for persistence. diff --git a/config/utils_test.go b/config/utils_test.go index da96970043..1754e174ac 100644 --- a/config/utils_test.go +++ b/config/utils_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/utils" ) func TestDesanitize(t *testing.T) { diff --git a/config/watcher.go b/config/watcher.go index 6fc6a445cd..6c4837c938 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/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) // watcher monitors a file for changes diff --git a/einterfaces/account_migration.go b/einterfaces/account_migration.go index d16412c758..08b47b2ba1 100644 --- a/einterfaces/account_migration.go +++ b/einterfaces/account_migration.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type AccountMigrationInterface interface { diff --git a/einterfaces/cloud.go b/einterfaces/cloud.go index 4650b36ebe..e07590c5fb 100644 --- a/einterfaces/cloud.go +++ b/einterfaces/cloud.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type CloudInterface interface { diff --git a/einterfaces/cluster.go b/einterfaces/cluster.go index 8fe0c550cd..6d52f35b5a 100644 --- a/einterfaces/cluster.go +++ b/einterfaces/cluster.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type ClusterMessageHandler func(msg *model.ClusterMessage) diff --git a/einterfaces/compliance.go b/einterfaces/compliance.go index 8ff660e0a8..ce607f79b6 100644 --- a/einterfaces/compliance.go +++ b/einterfaces/compliance.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type ComplianceInterface interface { diff --git a/einterfaces/data_retention.go b/einterfaces/data_retention.go index 4d75a0af27..9f317bd598 100644 --- a/einterfaces/data_retention.go +++ b/einterfaces/data_retention.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type DataRetentionInterface interface { diff --git a/einterfaces/jobs/cloud_interface.go b/einterfaces/jobs/cloud_interface.go index 1ebd77d671..62619cbbd6 100644 --- a/einterfaces/jobs/cloud_interface.go +++ b/einterfaces/jobs/cloud_interface.go @@ -4,7 +4,7 @@ package jobs import ( - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type CloudJobInterface interface { diff --git a/einterfaces/jobs/data_retention.go b/einterfaces/jobs/data_retention.go index c6bf94da56..c00ad5b20e 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/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type DataRetentionJobInterface interface { diff --git a/einterfaces/jobs/elasticsearch.go b/einterfaces/jobs/elasticsearch.go index b5d212e132..2078895127 100644 --- a/einterfaces/jobs/elasticsearch.go +++ b/einterfaces/jobs/elasticsearch.go @@ -4,7 +4,7 @@ package jobs import ( - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type ElasticsearchIndexerInterface interface { diff --git a/einterfaces/jobs/ldap_sync.go b/einterfaces/jobs/ldap_sync.go index 5bcfc9edfa..01f855043e 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/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type LdapSyncInterface interface { diff --git a/einterfaces/jobs/message_export.go b/einterfaces/jobs/message_export.go index e7f7fe5dc5..5d699d73bb 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/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type MessageExportJobInterface interface { diff --git a/einterfaces/jobs/resend_invitation_email.go b/einterfaces/jobs/resend_invitation_email.go index 3b4aefbb8c..3d971a494f 100644 --- a/einterfaces/jobs/resend_invitation_email.go +++ b/einterfaces/jobs/resend_invitation_email.go @@ -2,7 +2,7 @@ // See LICENSE.txt for license information. package jobs -import "github.com/mattermost/mattermost-server/v5/model" +import "github.com/mattermost/mattermost-server/v6/model" // ResendInvitationEmailJobInterface defines the interface for the job to resend invitation emails type ResendInvitationEmailJobInterface interface { diff --git a/einterfaces/ldap.go b/einterfaces/ldap.go index a029a29d23..990a4fd98a 100644 --- a/einterfaces/ldap.go +++ b/einterfaces/ldap.go @@ -4,8 +4,8 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" ) type LdapInterface interface { diff --git a/einterfaces/license.go b/einterfaces/license.go index 036742ca36..3a66ebe56f 100644 --- a/einterfaces/license.go +++ b/einterfaces/license.go @@ -3,7 +3,7 @@ package einterfaces -import "github.com/mattermost/mattermost-server/v5/model" +import "github.com/mattermost/mattermost-server/v6/model" type LicenseInterface interface { CanStartTrial() (bool, error) diff --git a/einterfaces/message_export.go b/einterfaces/message_export.go index 02a1ffd4fb..6411327a34 100644 --- a/einterfaces/message_export.go +++ b/einterfaces/message_export.go @@ -6,7 +6,7 @@ package einterfaces import ( "context" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type MessageExportInterface interface { diff --git a/einterfaces/metrics.go b/einterfaces/metrics.go index d2c3df5036..8da04ed4ee 100644 --- a/einterfaces/metrics.go +++ b/einterfaces/metrics.go @@ -5,7 +5,7 @@ package einterfaces import ( "github.com/mattermost/logr" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type MetricsInterface interface { diff --git a/einterfaces/mfa.go b/einterfaces/mfa.go index 2992ea2b7f..e3b89cabc0 100644 --- a/einterfaces/mfa.go +++ b/einterfaces/mfa.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type MfaInterface interface { diff --git a/einterfaces/mocks/AccountMigrationInterface.go b/einterfaces/mocks/AccountMigrationInterface.go index d8da617449..968200b076 100644 --- a/einterfaces/mocks/AccountMigrationInterface.go +++ b/einterfaces/mocks/AccountMigrationInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/einterfaces/mocks/AppContextInterface.go b/einterfaces/mocks/AppContextInterface.go index 25183a2a85..38205853c0 100644 --- a/einterfaces/mocks/AppContextInterface.go +++ b/einterfaces/mocks/AppContextInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/einterfaces/mocks/CloudInterface.go b/einterfaces/mocks/CloudInterface.go index 89d65ca7cf..1796b51371 100644 --- a/einterfaces/mocks/CloudInterface.go +++ b/einterfaces/mocks/CloudInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/einterfaces/mocks/CloudJobInterface.go b/einterfaces/mocks/CloudJobInterface.go index 8808c98ae8..52f0077e83 100644 --- a/einterfaces/mocks/CloudJobInterface.go +++ b/einterfaces/mocks/CloudJobInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/einterfaces/mocks/ClusterInterface.go b/einterfaces/mocks/ClusterInterface.go index 4aab8a6024..fa7bbf5963 100644 --- a/einterfaces/mocks/ClusterInterface.go +++ b/einterfaces/mocks/ClusterInterface.go @@ -5,10 +5,10 @@ package mocks import ( - einterfaces "github.com/mattermost/mattermost-server/v5/einterfaces" + einterfaces "github.com/mattermost/mattermost-server/v6/einterfaces" mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" ) // ClusterInterface is an autogenerated mock type for the ClusterInterface type diff --git a/einterfaces/mocks/ComplianceInterface.go b/einterfaces/mocks/ComplianceInterface.go index 019898b0dc..5ff8dcef92 100644 --- a/einterfaces/mocks/ComplianceInterface.go +++ b/einterfaces/mocks/ComplianceInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/einterfaces/mocks/DataRetentionInterface.go b/einterfaces/mocks/DataRetentionInterface.go index 78bf3d247b..347f4149d1 100644 --- a/einterfaces/mocks/DataRetentionInterface.go +++ b/einterfaces/mocks/DataRetentionInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/einterfaces/mocks/DataRetentionJobInterface.go b/einterfaces/mocks/DataRetentionJobInterface.go index 7febc2733c..0eea3890e3 100644 --- a/einterfaces/mocks/DataRetentionJobInterface.go +++ b/einterfaces/mocks/DataRetentionJobInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/einterfaces/mocks/ElasticsearchAggregatorInterface.go b/einterfaces/mocks/ElasticsearchAggregatorInterface.go index a1f9f298f2..54c7885238 100644 --- a/einterfaces/mocks/ElasticsearchAggregatorInterface.go +++ b/einterfaces/mocks/ElasticsearchAggregatorInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/einterfaces/mocks/ElasticsearchIndexerInterface.go b/einterfaces/mocks/ElasticsearchIndexerInterface.go index 20c533b8d9..c0775f7a5d 100644 --- a/einterfaces/mocks/ElasticsearchIndexerInterface.go +++ b/einterfaces/mocks/ElasticsearchIndexerInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/einterfaces/mocks/LdapInterface.go b/einterfaces/mocks/LdapInterface.go index fa3be959e9..950395b324 100644 --- a/einterfaces/mocks/LdapInterface.go +++ b/einterfaces/mocks/LdapInterface.go @@ -5,8 +5,8 @@ package mocks import ( - request "github.com/mattermost/mattermost-server/v5/app/request" - model "github.com/mattermost/mattermost-server/v5/model" + request "github.com/mattermost/mattermost-server/v6/app/request" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/einterfaces/mocks/LdapSyncInterface.go b/einterfaces/mocks/LdapSyncInterface.go index 379cea38d9..29ba813363 100644 --- a/einterfaces/mocks/LdapSyncInterface.go +++ b/einterfaces/mocks/LdapSyncInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/einterfaces/mocks/LicenseInterface.go b/einterfaces/mocks/LicenseInterface.go index a208271048..6160f415dc 100644 --- a/einterfaces/mocks/LicenseInterface.go +++ b/einterfaces/mocks/LicenseInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/einterfaces/mocks/MessageExportInterface.go b/einterfaces/mocks/MessageExportInterface.go index b81ef21b05..90f9b73778 100644 --- a/einterfaces/mocks/MessageExportInterface.go +++ b/einterfaces/mocks/MessageExportInterface.go @@ -9,7 +9,7 @@ import ( mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" ) // MessageExportInterface is an autogenerated mock type for the MessageExportInterface type diff --git a/einterfaces/mocks/MessageExportJobInterface.go b/einterfaces/mocks/MessageExportJobInterface.go index 075854d979..cdc1b7e93d 100644 --- a/einterfaces/mocks/MessageExportJobInterface.go +++ b/einterfaces/mocks/MessageExportJobInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/einterfaces/mocks/MetricsInterface.go b/einterfaces/mocks/MetricsInterface.go index 95c5d4ee2e..908d71e9af 100644 --- a/einterfaces/mocks/MetricsInterface.go +++ b/einterfaces/mocks/MetricsInterface.go @@ -8,7 +8,7 @@ import ( logr "github.com/mattermost/logr" mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" ) // MetricsInterface is an autogenerated mock type for the MetricsInterface type diff --git a/einterfaces/mocks/MfaInterface.go b/einterfaces/mocks/MfaInterface.go index 249b4e5ad5..ade8b82ef8 100644 --- a/einterfaces/mocks/MfaInterface.go +++ b/einterfaces/mocks/MfaInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/einterfaces/mocks/NotificationInterface.go b/einterfaces/mocks/NotificationInterface.go index ff77eab4bf..f63ccb8a56 100644 --- a/einterfaces/mocks/NotificationInterface.go +++ b/einterfaces/mocks/NotificationInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/einterfaces/mocks/OAuthProvider.go b/einterfaces/mocks/OAuthProvider.go index 11b7c1e072..31c4ecbc4a 100644 --- a/einterfaces/mocks/OAuthProvider.go +++ b/einterfaces/mocks/OAuthProvider.go @@ -7,7 +7,7 @@ package mocks import ( io "io" - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/einterfaces/mocks/ResendInvitationEmailJobInterface.go b/einterfaces/mocks/ResendInvitationEmailJobInterface.go index f8a8ea3b0b..8e69694e71 100644 --- a/einterfaces/mocks/ResendInvitationEmailJobInterface.go +++ b/einterfaces/mocks/ResendInvitationEmailJobInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/einterfaces/mocks/SamlInterface.go b/einterfaces/mocks/SamlInterface.go index 418c174f80..1c058ce22b 100644 --- a/einterfaces/mocks/SamlInterface.go +++ b/einterfaces/mocks/SamlInterface.go @@ -5,8 +5,8 @@ package mocks import ( - request "github.com/mattermost/mattermost-server/v5/app/request" - model "github.com/mattermost/mattermost-server/v5/model" + request "github.com/mattermost/mattermost-server/v6/app/request" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/einterfaces/notification.go b/einterfaces/notification.go index 3dcedf3044..9a63d9da26 100644 --- a/einterfaces/notification.go +++ b/einterfaces/notification.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type NotificationInterface interface { diff --git a/einterfaces/oauthproviders.go b/einterfaces/oauthproviders.go index 2e4e07b9f0..1c1bab563f 100644 --- a/einterfaces/oauthproviders.go +++ b/einterfaces/oauthproviders.go @@ -6,7 +6,7 @@ package einterfaces import ( "io" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type OAuthProvider interface { diff --git a/einterfaces/saml.go b/einterfaces/saml.go index b9900e0fcf..abe30febcd 100644 --- a/einterfaces/saml.go +++ b/einterfaces/saml.go @@ -4,8 +4,8 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" ) type SamlInterface interface { diff --git a/go.mod b/go.mod index 5fb9c1f5d8..16ed62d11c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/mattermost/mattermost-server/v5 +module github.com/mattermost/mattermost-server/v6 go 1.15 diff --git a/go.sum b/go.sum index 5aec731416..a3d88b27b2 100644 --- a/go.sum +++ b/go.sum @@ -395,7 +395,6 @@ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/go.tools.mod b/go.tools.mod index 4f273f5ed0..d19172a283 100644 --- a/go.tools.mod +++ b/go.tools.mod @@ -1,4 +1,4 @@ -module github.com/mattermost/mattermost-server/v5 +module github.com/mattermost/mattermost-server/v6 go 1.14 diff --git a/imports/placeholder.go b/imports/placeholder.go index a3d82e252c..410f12d034 100644 --- a/imports/placeholder.go +++ b/imports/placeholder.go @@ -5,35 +5,35 @@ package imports import ( // This is a placeholder so this package can be imported in Team Edition when it will be otherwise empty. - _ "github.com/mattermost/mattermost-server/v5/migrations" + _ "github.com/mattermost/mattermost-server/v6/migrations" // This is a placeholder so this package can be imported in Team Edition when it will be otherwise empty. - _ "github.com/mattermost/mattermost-server/v5/plugin/scheduler" + _ "github.com/mattermost/mattermost-server/v6/plugin/scheduler" // This is a placeholder so this package can be imported in Team Edition when it will be otherwise empty. - _ "github.com/mattermost/mattermost-server/v5/services/searchengine/bleveengine/indexer" + _ "github.com/mattermost/mattermost-server/v6/services/searchengine/bleveengine/indexer" // This is a placeholder so this package can be imported in Team Edition when it will be otherwise empty. - _ "github.com/mattermost/mattermost-server/v5/jobs/expirynotify" + _ "github.com/mattermost/mattermost-server/v6/jobs/expirynotify" // This is a placeholder so this package can be imported in Team Edition when it will be otherwise empty. - _ "github.com/mattermost/mattermost-server/v5/jobs/active_users" + _ "github.com/mattermost/mattermost-server/v6/jobs/active_users" // This is a placeholder so this package can be imported in Team Edition when it will be otherwise empty. - _ "github.com/mattermost/mattermost-server/v5/jobs/product_notices" + _ "github.com/mattermost/mattermost-server/v6/jobs/product_notices" // This is a placeholder so this package can be imported in Team Edition when it will be otherwise empty. - _ "github.com/mattermost/mattermost-server/v5/jobs/import_process" + _ "github.com/mattermost/mattermost-server/v6/jobs/import_process" // This is a placeholder so this package can be imported in Team Edition when it will be otherwise empty. - _ "github.com/mattermost/mattermost-server/v5/jobs/import_delete" + _ "github.com/mattermost/mattermost-server/v6/jobs/import_delete" // This is a placeholder so this package can be imported in Team Edition when it will be otherwise empty. - _ "github.com/mattermost/mattermost-server/v5/jobs/export_process" + _ "github.com/mattermost/mattermost-server/v6/jobs/export_process" // This is a placeholder so this package can be imported in Team Edition when it will be otherwise empty. - _ "github.com/mattermost/mattermost-server/v5/jobs/export_delete" + _ "github.com/mattermost/mattermost-server/v6/jobs/export_delete" // This is a placeholder so this package can be imported in Team Edition when it will be otherwise empty. - _ "github.com/mattermost/mattermost-server/v5/jobs/resend_invitation_email" + _ "github.com/mattermost/mattermost-server/v6/jobs/resend_invitation_email" ) diff --git a/jobs/active_users/scheduler.go b/jobs/active_users/scheduler.go index 087cc52403..569f8051f4 100644 --- a/jobs/active_users/scheduler.go +++ b/jobs/active_users/scheduler.go @@ -6,8 +6,8 @@ package active_users import ( "time" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/model" ) const ( diff --git a/jobs/active_users/worker.go b/jobs/active_users/worker.go index f963acff1f..6c49c6268a 100644 --- a/jobs/active_users/worker.go +++ b/jobs/active_users/worker.go @@ -6,11 +6,11 @@ package active_users import ( "net/http" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/jobs" - tjobs "github.com/mattermost/mattermost-server/v5/jobs/interfaces" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/jobs" + tjobs "github.com/mattermost/mattermost-server/v6/jobs/interfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const ( diff --git a/jobs/expirynotify/expirynotify.go b/jobs/expirynotify/expirynotify.go index cceaf07a35..3451cabca0 100644 --- a/jobs/expirynotify/expirynotify.go +++ b/jobs/expirynotify/expirynotify.go @@ -4,8 +4,8 @@ package expirynotify import ( - "github.com/mattermost/mattermost-server/v5/app" - tjobs "github.com/mattermost/mattermost-server/v5/jobs/interfaces" + "github.com/mattermost/mattermost-server/v6/app" + tjobs "github.com/mattermost/mattermost-server/v6/jobs/interfaces" ) type ExpiryNotifyJobInterfaceImpl struct { diff --git a/jobs/expirynotify/scheduler.go b/jobs/expirynotify/scheduler.go index 938f74d8b8..bc24952655 100644 --- a/jobs/expirynotify/scheduler.go +++ b/jobs/expirynotify/scheduler.go @@ -6,8 +6,8 @@ package expirynotify import ( "time" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/model" ) const ( diff --git a/jobs/expirynotify/worker.go b/jobs/expirynotify/worker.go index 64088d885e..37c8f10943 100644 --- a/jobs/expirynotify/worker.go +++ b/jobs/expirynotify/worker.go @@ -4,10 +4,10 @@ package expirynotify import ( - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/jobs" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/jobs" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const ( diff --git a/jobs/export_delete/scheduler.go b/jobs/export_delete/scheduler.go index bc91c1b757..9f06efdbe1 100644 --- a/jobs/export_delete/scheduler.go +++ b/jobs/export_delete/scheduler.go @@ -6,8 +6,8 @@ package export_delete import ( "time" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/model" ) const ( diff --git a/jobs/export_delete/worker.go b/jobs/export_delete/worker.go index 0f649fa70f..2a3e459d10 100644 --- a/jobs/export_delete/worker.go +++ b/jobs/export_delete/worker.go @@ -7,11 +7,11 @@ import ( "path/filepath" "time" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/jobs" - tjobs "github.com/mattermost/mattermost-server/v5/jobs/interfaces" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/jobs" + tjobs "github.com/mattermost/mattermost-server/v6/jobs/interfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) func init() { diff --git a/jobs/export_process/worker.go b/jobs/export_process/worker.go index 8732b31593..ecde5bc604 100644 --- a/jobs/export_process/worker.go +++ b/jobs/export_process/worker.go @@ -7,11 +7,11 @@ import ( "io" "path/filepath" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/jobs" - tjobs "github.com/mattermost/mattermost-server/v5/jobs/interfaces" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/jobs" + tjobs "github.com/mattermost/mattermost-server/v6/jobs/interfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) func init() { diff --git a/jobs/import_delete/scheduler.go b/jobs/import_delete/scheduler.go index 6338c514d6..5d3e9b95e1 100644 --- a/jobs/import_delete/scheduler.go +++ b/jobs/import_delete/scheduler.go @@ -6,8 +6,8 @@ package import_delete import ( "time" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/model" ) const ( diff --git a/jobs/import_delete/worker.go b/jobs/import_delete/worker.go index d8bc1b8a2b..9bdc8bb94e 100644 --- a/jobs/import_delete/worker.go +++ b/jobs/import_delete/worker.go @@ -8,12 +8,12 @@ import ( "path/filepath" "time" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/jobs" - tjobs "github.com/mattermost/mattermost-server/v5/jobs/interfaces" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/jobs" + tjobs "github.com/mattermost/mattermost-server/v6/jobs/interfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) func init() { diff --git a/jobs/import_process/worker.go b/jobs/import_process/worker.go index dc04e7eb6f..ced43f3c65 100644 --- a/jobs/import_process/worker.go +++ b/jobs/import_process/worker.go @@ -12,12 +12,12 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/jobs" - tjobs "github.com/mattermost/mattermost-server/v5/jobs/interfaces" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/jobs" + tjobs "github.com/mattermost/mattermost-server/v6/jobs/interfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) func init() { diff --git a/jobs/interfaces/active_users_interface.go b/jobs/interfaces/active_users_interface.go index 286072ba4a..8ed82b1ade 100644 --- a/jobs/interfaces/active_users_interface.go +++ b/jobs/interfaces/active_users_interface.go @@ -4,7 +4,7 @@ package interfaces import ( - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type ActiveUsersJobInterface interface { diff --git a/jobs/interfaces/expirynotify_interface.go b/jobs/interfaces/expirynotify_interface.go index d47305bb64..53bb072fae 100644 --- a/jobs/interfaces/expirynotify_interface.go +++ b/jobs/interfaces/expirynotify_interface.go @@ -4,7 +4,7 @@ package interfaces import ( - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type ExpiryNotifyJobInterface interface { diff --git a/jobs/interfaces/export_delete_interface.go b/jobs/interfaces/export_delete_interface.go index 5912b85f9b..e5107d6a35 100644 --- a/jobs/interfaces/export_delete_interface.go +++ b/jobs/interfaces/export_delete_interface.go @@ -3,7 +3,7 @@ package interfaces -import "github.com/mattermost/mattermost-server/v5/model" +import "github.com/mattermost/mattermost-server/v6/model" type ExportDeleteInterface interface { MakeWorker() model.Worker diff --git a/jobs/interfaces/export_process_interface.go b/jobs/interfaces/export_process_interface.go index f2f1502a53..837781e2a3 100644 --- a/jobs/interfaces/export_process_interface.go +++ b/jobs/interfaces/export_process_interface.go @@ -4,7 +4,7 @@ package interfaces import ( - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type ExportProcessInterface interface { diff --git a/jobs/interfaces/import_delete_interface.go b/jobs/interfaces/import_delete_interface.go index 8506ec8ff2..cedf8a623a 100644 --- a/jobs/interfaces/import_delete_interface.go +++ b/jobs/interfaces/import_delete_interface.go @@ -3,7 +3,7 @@ package interfaces -import "github.com/mattermost/mattermost-server/v5/model" +import "github.com/mattermost/mattermost-server/v6/model" type ImportDeleteInterface interface { MakeWorker() model.Worker diff --git a/jobs/interfaces/import_process_interface.go b/jobs/interfaces/import_process_interface.go index 3be3997410..85b7cda03a 100644 --- a/jobs/interfaces/import_process_interface.go +++ b/jobs/interfaces/import_process_interface.go @@ -4,7 +4,7 @@ package interfaces import ( - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type ImportProcessInterface interface { diff --git a/jobs/interfaces/indexer_interface.go b/jobs/interfaces/indexer_interface.go index 1053b57d64..a85872c41b 100644 --- a/jobs/interfaces/indexer_interface.go +++ b/jobs/interfaces/indexer_interface.go @@ -4,7 +4,7 @@ package interfaces import ( - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type IndexerJobInterface interface { diff --git a/jobs/interfaces/migrations_interface.go b/jobs/interfaces/migrations_interface.go index 879df39ea1..8772db7c31 100644 --- a/jobs/interfaces/migrations_interface.go +++ b/jobs/interfaces/migrations_interface.go @@ -4,7 +4,7 @@ package interfaces import ( - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type MigrationsJobInterface interface { diff --git a/jobs/interfaces/plugins_interface.go b/jobs/interfaces/plugins_interface.go index 2a2bcf5bc8..0dab1b2542 100644 --- a/jobs/interfaces/plugins_interface.go +++ b/jobs/interfaces/plugins_interface.go @@ -4,7 +4,7 @@ package interfaces import ( - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type PluginsJobInterface interface { diff --git a/jobs/interfaces/product_notices_interface.go b/jobs/interfaces/product_notices_interface.go index a260bc7ace..126696e460 100644 --- a/jobs/interfaces/product_notices_interface.go +++ b/jobs/interfaces/product_notices_interface.go @@ -4,7 +4,7 @@ package interfaces import ( - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type ProductNoticesJobInterface interface { diff --git a/jobs/jobs.go b/jobs/jobs.go index ce2ecc9cc6..22779a69d4 100644 --- a/jobs/jobs.go +++ b/jobs/jobs.go @@ -9,9 +9,9 @@ import ( "net/http" "time" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) const ( diff --git a/jobs/jobs_test.go b/jobs/jobs_test.go index 4776e468f5..fb17d45b6c 100644 --- a/jobs/jobs_test.go +++ b/jobs/jobs_test.go @@ -8,11 +8,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/einterfaces/mocks" - "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/utils/testutils" + "github.com/mattermost/mattermost-server/v6/einterfaces/mocks" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/store/storetest" + "github.com/mattermost/mattermost-server/v6/utils/testutils" ) func makeJobServer(t *testing.T) (*JobServer, *storetest.Store, *mocks.MetricsInterface) { diff --git a/jobs/jobs_watcher.go b/jobs/jobs_watcher.go index 5b2939c263..e103196e13 100644 --- a/jobs/jobs_watcher.go +++ b/jobs/jobs_watcher.go @@ -7,8 +7,8 @@ import ( "math/rand" "time" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) // Default polling interval for jobs termination. diff --git a/jobs/product_notices/product_notices.go b/jobs/product_notices/product_notices.go index 41dcee7dde..b495b0df67 100644 --- a/jobs/product_notices/product_notices.go +++ b/jobs/product_notices/product_notices.go @@ -4,8 +4,8 @@ package product_notices import ( - "github.com/mattermost/mattermost-server/v5/app" - tjobs "github.com/mattermost/mattermost-server/v5/jobs/interfaces" + "github.com/mattermost/mattermost-server/v6/app" + tjobs "github.com/mattermost/mattermost-server/v6/jobs/interfaces" ) type ProductNoticesJobInterfaceImpl struct { diff --git a/jobs/product_notices/scheduler.go b/jobs/product_notices/scheduler.go index 4097ea59ba..e85d30e8ef 100644 --- a/jobs/product_notices/scheduler.go +++ b/jobs/product_notices/scheduler.go @@ -6,8 +6,8 @@ package product_notices import ( "time" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/model" ) type Scheduler struct { diff --git a/jobs/product_notices/worker.go b/jobs/product_notices/worker.go index 8f0a794776..e8a9d91534 100644 --- a/jobs/product_notices/worker.go +++ b/jobs/product_notices/worker.go @@ -4,10 +4,10 @@ package product_notices import ( - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/jobs" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/jobs" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const ( diff --git a/jobs/resend_invitation_email/resend_invitation_email.go b/jobs/resend_invitation_email/resend_invitation_email.go index 0d07d97d6e..d47fef878b 100644 --- a/jobs/resend_invitation_email/resend_invitation_email.go +++ b/jobs/resend_invitation_email/resend_invitation_email.go @@ -3,8 +3,8 @@ package resend_invitation_email import ( - "github.com/mattermost/mattermost-server/v5/app" - ejobs "github.com/mattermost/mattermost-server/v5/einterfaces/jobs" + "github.com/mattermost/mattermost-server/v6/app" + ejobs "github.com/mattermost/mattermost-server/v6/einterfaces/jobs" ) type ResendInvitationEmailJobInterfaceImpl struct { diff --git a/jobs/resend_invitation_email/scheduler.go b/jobs/resend_invitation_email/scheduler.go index d904276fa2..d69bbc3e75 100644 --- a/jobs/resend_invitation_email/scheduler.go +++ b/jobs/resend_invitation_email/scheduler.go @@ -5,8 +5,8 @@ package resend_invitation_email import ( "time" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/model" ) const ResendInvitationEmailJob = "ResendInvitationEmailJob" diff --git a/jobs/resend_invitation_email/worker.go b/jobs/resend_invitation_email/worker.go index fd4e266d26..bcb5092e07 100644 --- a/jobs/resend_invitation_email/worker.go +++ b/jobs/resend_invitation_email/worker.go @@ -8,9 +8,9 @@ import ( "os" "strconv" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const TwentyFourHoursInMillis int64 = 86400000 diff --git a/jobs/schedulers.go b/jobs/schedulers.go index 391c1176ee..774f4c6fc9 100644 --- a/jobs/schedulers.go +++ b/jobs/schedulers.go @@ -8,8 +8,8 @@ import ( "fmt" "time" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) type Schedulers struct { diff --git a/jobs/schedulers_test.go b/jobs/schedulers_test.go index efa9e57a29..57cff00215 100644 --- a/jobs/schedulers_test.go +++ b/jobs/schedulers_test.go @@ -9,11 +9,11 @@ import ( "github.com/stretchr/testify/assert" - "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/storetest" - "github.com/mattermost/mattermost-server/v5/utils/testutils" + "github.com/mattermost/mattermost-server/v6/einterfaces/mocks" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/v6/store/storetest" + "github.com/mattermost/mattermost-server/v6/utils/testutils" ) type MockScheduler struct { diff --git a/jobs/server.go b/jobs/server.go index 74703e4397..73961c12d6 100644 --- a/jobs/server.go +++ b/jobs/server.go @@ -6,12 +6,12 @@ package jobs import ( "sync" - "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/model" - "github.com/mattermost/mattermost-server/v5/services/configservice" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/einterfaces" + ejobs "github.com/mattermost/mattermost-server/v6/einterfaces/jobs" + tjobs "github.com/mattermost/mattermost-server/v6/jobs/interfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/configservice" + "github.com/mattermost/mattermost-server/v6/store" ) type JobServer struct { diff --git a/jobs/workers.go b/jobs/workers.go index 660015d86a..2d13b45fde 100644 --- a/jobs/workers.go +++ b/jobs/workers.go @@ -6,9 +6,9 @@ package jobs import ( "errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/configservice" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/configservice" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) type Workers struct { diff --git a/manualtesting/manual_testing.go b/manualtesting/manual_testing.go index 5303f20a4b..77b6d031b1 100644 --- a/manualtesting/manual_testing.go +++ b/manualtesting/manual_testing.go @@ -12,14 +12,14 @@ import ( "strconv" "time" - "github.com/mattermost/mattermost-server/v5/api4" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/slashcommands" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "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/v6/api4" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/slashcommands" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/utils" + "github.com/mattermost/mattermost-server/v6/web" ) // TestEnvironment is a helper struct used for tests in manualtesting. diff --git a/manualtesting/test_autolink.go b/manualtesting/test_autolink.go index fb5769d1bb..7076a66070 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/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const linkPostText = ` diff --git a/migrations/advanced_permissions_phase_2.go b/migrations/advanced_permissions_phase_2.go index e0c91a29e9..cb0e33345b 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/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type AdvancedPermissionsPhase2Progress struct { diff --git a/migrations/helper_test.go b/migrations/helper_test.go index 9c36edb350..23a278cd31 100644 --- a/migrations/helper_test.go +++ b/migrations/helper_test.go @@ -6,12 +6,12 @@ package migrations import ( "os" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/config" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store/localcachelayer" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/config" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store/localcachelayer" + "github.com/mattermost/mattermost-server/v6/utils" ) type TestHelper struct { diff --git a/migrations/main_test.go b/migrations/main_test.go index 7b89d92d92..8826e085b5 100644 --- a/migrations/main_test.go +++ b/migrations/main_test.go @@ -6,8 +6,8 @@ package migrations import ( "testing" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/testlib" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/testlib" ) var mainHelper *testlib.MainHelper diff --git a/migrations/migrations.go b/migrations/migrations.go index db0c31bb1b..df49a28dca 100644 --- a/migrations/migrations.go +++ b/migrations/migrations.go @@ -6,10 +6,10 @@ package migrations import ( "net/http" - "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" + "github.com/mattermost/mattermost-server/v6/app" + tjobs "github.com/mattermost/mattermost-server/v6/jobs/interfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) const ( diff --git a/migrations/migrations_test.go b/migrations/migrations_test.go index a47b2f365f..d88b63ade5 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/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestGetMigrationState(t *testing.T) { diff --git a/migrations/scheduler.go b/migrations/scheduler.go index 6e75c49bc4..119ceafa85 100644 --- a/migrations/scheduler.go +++ b/migrations/scheduler.go @@ -6,9 +6,9 @@ package migrations import ( "time" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const ( diff --git a/migrations/worker.go b/migrations/worker.go index c1b4000e33..af8d81b4b8 100644 --- a/migrations/worker.go +++ b/migrations/worker.go @@ -8,10 +8,10 @@ import ( "net/http" "time" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/jobs" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/jobs" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const ( diff --git a/model/bundle_info.go b/model/bundle_info.go index e4cfe12563..63969de7fc 100644 --- a/model/bundle_info.go +++ b/model/bundle_info.go @@ -4,7 +4,7 @@ package model import ( - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) type BundleInfo struct { diff --git a/model/client4_test.go b/model/client4_test.go index 6429a2b724..d1889bded5 100644 --- a/model/client4_test.go +++ b/model/client4_test.go @@ -25,7 +25,7 @@ func TestClient4TrimTrailingSlash(t *testing.T) { } } -// https://github.com/mattermost/mattermost-server/v5/issues/8205 +// https://github.com/mattermost/mattermost-server/v6/issues/8205 func TestClient4CreatePost(t *testing.T) { post := &Post{ Props: map[string]interface{}{ diff --git a/model/command_args.go b/model/command_args.go index 45239d2cb5..fa73ba1f68 100644 --- a/model/command_args.go +++ b/model/command_args.go @@ -7,7 +7,7 @@ import ( "encoding/json" "io" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) type CommandArgs struct { diff --git a/model/command_response.go b/model/command_response.go index 7bf4aa0aff..99497f31c5 100644 --- a/model/command_response.go +++ b/model/command_response.go @@ -9,7 +9,7 @@ import ( "io/ioutil" "strings" - "github.com/mattermost/mattermost-server/v5/utils/jsonutils" + "github.com/mattermost/mattermost-server/v6/utils/jsonutils" ) const ( diff --git a/model/config.go b/model/config.go index d32d4fbc9b..bad42ad643 100644 --- a/model/config.go +++ b/model/config.go @@ -20,8 +20,8 @@ import ( "github.com/mattermost/ldap" - "github.com/mattermost/mattermost-server/v5/shared/filestore" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/filestore" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const ( diff --git a/model/gitlab/gitlab.go b/model/gitlab/gitlab.go index 61d13fe03a..a14844330a 100644 --- a/model/gitlab/gitlab.go +++ b/model/gitlab/gitlab.go @@ -10,8 +10,8 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v5/einterfaces" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" ) type GitLabProvider struct { diff --git a/model/post.go b/model/post.go index 79b78ef7d5..46bb703ab9 100644 --- a/model/post.go +++ b/model/post.go @@ -14,7 +14,7 @@ import ( "sync" "unicode/utf8" - "github.com/mattermost/mattermost-server/v5/shared/markdown" + "github.com/mattermost/mattermost-server/v6/shared/markdown" ) const ( diff --git a/model/session.go b/model/session.go index 44f0de7d7b..e5e51c4e07 100644 --- a/model/session.go +++ b/model/session.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const ( diff --git a/model/user.go b/model/user.go index ca9b228d9e..6ab414ff61 100644 --- a/model/user.go +++ b/model/user.go @@ -18,8 +18,8 @@ import ( "golang.org/x/crypto/bcrypt" "golang.org/x/text/language" - "github.com/mattermost/mattermost-server/v5/services/timezones" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/services/timezones" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const ( diff --git a/model/utils.go b/model/utils.go index bbf54e75cb..481d57ce94 100644 --- a/model/utils.go +++ b/model/utils.go @@ -22,7 +22,7 @@ import ( "time" "unicode" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/i18n" "github.com/pborman/uuid" ) diff --git a/model/websocket_request.go b/model/websocket_request.go index f18f128552..2468e21e2b 100644 --- a/model/websocket_request.go +++ b/model/websocket_request.go @@ -7,7 +7,7 @@ import ( "encoding/json" "io" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) // WebSocketRequest represents a request made to the server through a websocket. diff --git a/plugin/api.go b/plugin/api.go index d2a8df21c0..e82eb155d5 100644 --- a/plugin/api.go +++ b/plugin/api.go @@ -9,7 +9,7 @@ import ( plugin "github.com/hashicorp/go-plugin" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) // The API can be used to retrieve data or perform actions on behalf of the plugin. Most methods diff --git a/plugin/api_timer_layer_generated.go b/plugin/api_timer_layer_generated.go index 2c3769792f..5600e42fe9 100644 --- a/plugin/api_timer_layer_generated.go +++ b/plugin/api_timer_layer_generated.go @@ -11,8 +11,8 @@ import ( "net/http" timePkg "time" - "github.com/mattermost/mattermost-server/v5/einterfaces" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" ) type apiTimerLayer struct { diff --git a/plugin/checker/check_api.go b/plugin/checker/check_api.go index 5940a1da6a..707da34e9c 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/v5/plugin/checker/internal/asthelpers" - "github.com/mattermost/mattermost-server/v5/plugin/checker/internal/version" + "github.com/mattermost/mattermost-server/v6/plugin/checker/internal/asthelpers" + "github.com/mattermost/mattermost-server/v6/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 ea4d2db6fd..c270399abc 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/v5/plugin/checker/internal/test/valid", + pkgPath: "github.com/mattermost/mattermost-server/v6/plugin/checker/internal/test/valid", err: "", }, { name: "invalid comments", - pkgPath: "github.com/mattermost/mattermost-server/v5/plugin/checker/internal/test/invalid", + pkgPath: "github.com/mattermost/mattermost-server/v6/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/v5/plugin/checker/internal/test/missing", + pkgPath: "github.com/mattermost/mattermost-server/v6/plugin/checker/internal/test/missing", err: "could not find API interface", }, { name: "non-existent package path", - pkgPath: "github.com/mattermost/mattermost-server/v5/plugin/checker/internal/test/does_not_exist", + pkgPath: "github.com/mattermost/mattermost-server/v6/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 94e7aa41f1..61040f2cb3 100644 --- a/plugin/checker/check_helpers.go +++ b/plugin/checker/check_helpers.go @@ -11,8 +11,8 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/plugin/checker/internal/asthelpers" - "github.com/mattermost/mattermost-server/v5/plugin/checker/internal/version" + "github.com/mattermost/mattermost-server/v6/plugin/checker/internal/asthelpers" + "github.com/mattermost/mattermost-server/v6/plugin/checker/internal/version" ) func checkHelpersVersionComments(pkgPath string) (result, error) { diff --git a/plugin/checker/check_helpers_test.go b/plugin/checker/check_helpers_test.go index 177421158f..71b117c72e 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/v5/plugin/checker/internal/test/valid", + pkgPath: "github.com/mattermost/mattermost-server/v6/plugin/checker/internal/test/valid", expected: result{}, }, { name: "invalid versions", - pkgPath: "github.com/mattermost/mattermost-server/v5/plugin/checker/internal/test/invalid", + pkgPath: "github.com/mattermost/mattermost-server/v6/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 37298955e0..282a325df1 100644 --- a/plugin/checker/main.go +++ b/plugin/checker/main.go @@ -10,7 +10,7 @@ import ( "strings" ) -const pluginPackagePath = "github.com/mattermost/mattermost-server/v5/plugin" +const pluginPackagePath = "github.com/mattermost/mattermost-server/v6/plugin" type result struct { Warnings []string diff --git a/plugin/client_rpc.go b/plugin/client_rpc.go index 798a6c79f3..0baaa671fb 100644 --- a/plugin/client_rpc.go +++ b/plugin/client_rpc.go @@ -25,8 +25,8 @@ import ( "github.com/hashicorp/go-plugin" "github.com/lib/pq" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) var hookNameToId map[string]int = make(map[string]int) diff --git a/plugin/client_rpc_generated.go b/plugin/client_rpc_generated.go index 309a6bfee6..515b7c2f00 100644 --- a/plugin/client_rpc_generated.go +++ b/plugin/client_rpc_generated.go @@ -10,8 +10,8 @@ import ( "fmt" "log" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) func init() { diff --git a/plugin/environment.go b/plugin/environment.go index 50c2b037cd..1071e735af 100644 --- a/plugin/environment.go +++ b/plugin/environment.go @@ -14,10 +14,10 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/einterfaces" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/utils" ) var ErrNotFound = errors.New("Item not found") diff --git a/plugin/environment_test.go b/plugin/environment_test.go index 1494badb51..6b32b7721e 100644 --- a/plugin/environment_test.go +++ b/plugin/environment_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestAvaliablePlugins(t *testing.T) { diff --git a/plugin/example_hello_world_test.go b/plugin/example_hello_world_test.go index 2918ad7875..59ed5a01cd 100644 --- a/plugin/example_hello_world_test.go +++ b/plugin/example_hello_world_test.go @@ -7,7 +7,7 @@ import ( "fmt" "net/http" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/plugin" ) // HelloWorldPlugin implements the interface expected by the Mattermost server to communicate diff --git a/plugin/example_help_test.go b/plugin/example_help_test.go index fd4f6120c6..d55d7232f8 100644 --- a/plugin/example_help_test.go +++ b/plugin/example_help_test.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/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 09826988d2..d4e07d14df 100644 --- a/plugin/hclog_adapter.go +++ b/plugin/hclog_adapter.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/go-hclog" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) type hclogAdapter struct { diff --git a/plugin/health_check.go b/plugin/health_check.go index 69beb23a2d..97491cac93 100644 --- a/plugin/health_check.go +++ b/plugin/health_check.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const ( diff --git a/plugin/health_check_test.go b/plugin/health_check_test.go index 8a7d929a26..b5c5de8a54 100644 --- a/plugin/health_check_test.go +++ b/plugin/health_check_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/utils" ) func TestPluginHealthCheck(t *testing.T) { @@ -36,7 +36,7 @@ func testPluginHealthCheckSuccess(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/plugin" ) type MyPlugin struct { @@ -78,8 +78,8 @@ func testPluginHealthCheckPanic(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" ) type MyPlugin struct { diff --git a/plugin/helpers.go b/plugin/helpers.go index 3c722dc6fe..946c5bc89c 100644 --- a/plugin/helpers.go +++ b/plugin/helpers.go @@ -6,7 +6,7 @@ package plugin import ( "database/sql/driver" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) // Helpers provide a common patterns plugins use. diff --git a/plugin/helpers_bots.go b/plugin/helpers_bots.go index 31e1f0b4fa..011bce85a6 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/v5/model" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/utils" ) type ensureBotOptions struct { diff --git a/plugin/helpers_bots_test.go b/plugin/helpers_bots_test.go index 6983688a45..a0a35e9bf3 100644 --- a/plugin/helpers_bots_test.go +++ b/plugin/helpers_bots_test.go @@ -10,11 +10,11 @@ import ( "github.com/stretchr/testify/assert" - "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/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/plugin/plugintest" + "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) func TestEnsureBot(t *testing.T) { diff --git a/plugin/helpers_config.go b/plugin/helpers_config.go index 512fbbd723..79f665ecda 100644 --- a/plugin/helpers_config.go +++ b/plugin/helpers_config.go @@ -6,8 +6,8 @@ package plugin import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/utils" ) // CheckRequiredServerConfiguration implements Helpers.CheckRequiredServerConfiguration diff --git a/plugin/helpers_config_test.go b/plugin/helpers_config_test.go index 7ee892286c..458c3aa4f4 100644 --- a/plugin/helpers_config_test.go +++ b/plugin/helpers_config_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/assert" - "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/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/plugin/plugintest" ) func TestCheckRequiredServerConfiguration(t *testing.T) { diff --git a/plugin/helpers_kv_test.go b/plugin/helpers_kv_test.go index 19725aca49..b08c2cef84 100644 --- a/plugin/helpers_kv_test.go +++ b/plugin/helpers_kv_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" - "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/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/plugin/plugintest" ) func TestKVGetJSON(t *testing.T) { diff --git a/plugin/helpers_plugin.go b/plugin/helpers_plugin.go index 6fa0c48db6..d64d9add2e 100644 --- a/plugin/helpers_plugin.go +++ b/plugin/helpers_plugin.go @@ -12,7 +12,7 @@ import ( "github.com/blang/semver" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) // InstallPluginFromURL implements Helpers.InstallPluginFromURL. diff --git a/plugin/helpers_plugin_test.go b/plugin/helpers_plugin_test.go index ae5a7846ee..79e5e00947 100644 --- a/plugin/helpers_plugin_test.go +++ b/plugin/helpers_plugin_test.go @@ -13,11 +13,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "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/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/plugin/plugintest" + "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) func TestInstallPluginFromURL(t *testing.T) { diff --git a/plugin/hooks.go b/plugin/hooks.go index b002b6a53e..a88f9e90f9 100644 --- a/plugin/hooks.go +++ b/plugin/hooks.go @@ -7,7 +7,7 @@ import ( "io" "net/http" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) // These assignments are part of the wire protocol used to trigger hook events in plugins. diff --git a/plugin/hooks_timer_layer_generated.go b/plugin/hooks_timer_layer_generated.go index 81635d7a13..9bac911ae7 100644 --- a/plugin/hooks_timer_layer_generated.go +++ b/plugin/hooks_timer_layer_generated.go @@ -11,8 +11,8 @@ import ( "net/http" timePkg "time" - "github.com/mattermost/mattermost-server/v5/einterfaces" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" ) type hooksTimerLayer struct { diff --git a/plugin/http.go b/plugin/http.go index 65c17749b9..a1e674a08a 100644 --- a/plugin/http.go +++ b/plugin/http.go @@ -12,7 +12,7 @@ import ( "net/http" "net/rpc" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) type hijackedResponse struct { diff --git a/plugin/interface_generator/main.go b/plugin/interface_generator/main.go index c0c70059c7..6ee6d60d69 100644 --- a/plugin/interface_generator/main.go +++ b/plugin/interface_generator/main.go @@ -373,8 +373,8 @@ import ( "net/http" timePkg "time" - "github.com/mattermost/mattermost-server/v5/einterfaces" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" ) type apiTimerLayer struct { @@ -415,8 +415,8 @@ import ( "net/http" timePkg "time" - "github.com/mattermost/mattermost-server/v5/einterfaces" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" ) type hooksTimerLayer struct { @@ -563,7 +563,7 @@ func generatePluginTimerLayer(info *PluginInterfaceInfo) { } func getPluginPackageDir() string { - dirs, err := goList("github.com/mattermost/mattermost-server/v5/plugin") + dirs, err := goList("github.com/mattermost/mattermost-server/v6/plugin") if err != nil { panic(err) } else if len(dirs) != 1 { diff --git a/plugin/plugintest/api.go b/plugin/plugintest/api.go index d75d839092..3c58c020fa 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/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" ) // API is an autogenerated mock type for the API type diff --git a/plugin/plugintest/doc.go b/plugin/plugintest/doc.go index ed55748af2..b20f1a92c3 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/v5/plugin/plugintest/mock". +// "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock". package plugintest diff --git a/plugin/plugintest/driver.go b/plugin/plugintest/driver.go index d2bd68f648..805470821f 100644 --- a/plugin/plugintest/driver.go +++ b/plugin/plugintest/driver.go @@ -9,7 +9,7 @@ import ( mock "github.com/stretchr/testify/mock" - plugin "github.com/mattermost/mattermost-server/v5/plugin" + plugin "github.com/mattermost/mattermost-server/v6/plugin" ) // Driver is an autogenerated mock type for the Driver type diff --git a/plugin/plugintest/example_hello_user_test.go b/plugin/plugintest/example_hello_user_test.go index 30362b6c59..06b395d65d 100644 --- a/plugin/plugintest/example_hello_user_test.go +++ b/plugin/plugintest/example_hello_user_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "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/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/plugin/plugintest" ) type HelloUserPlugin struct { diff --git a/plugin/plugintest/helpers.go b/plugin/plugintest/helpers.go index 48baa601a5..0af1321810 100644 --- a/plugin/plugintest/helpers.go +++ b/plugin/plugintest/helpers.go @@ -5,8 +5,8 @@ package plugintest import ( - model "github.com/mattermost/mattermost-server/v5/model" - plugin "github.com/mattermost/mattermost-server/v5/plugin" + model "github.com/mattermost/mattermost-server/v6/model" + plugin "github.com/mattermost/mattermost-server/v6/plugin" mock "github.com/stretchr/testify/mock" ) diff --git a/plugin/plugintest/hooks.go b/plugin/plugintest/hooks.go index c62e4f6447..7a55bc4030 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/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" - plugin "github.com/mattermost/mattermost-server/v5/plugin" + plugin "github.com/mattermost/mattermost-server/v6/plugin" ) // Hooks is an autogenerated mock type for the Hooks type diff --git a/plugin/scheduler/plugin.go b/plugin/scheduler/plugin.go index 4bd07f3e15..d035c39f67 100644 --- a/plugin/scheduler/plugin.go +++ b/plugin/scheduler/plugin.go @@ -4,8 +4,8 @@ package scheduler import ( - "github.com/mattermost/mattermost-server/v5/app" - tjobs "github.com/mattermost/mattermost-server/v5/jobs/interfaces" + "github.com/mattermost/mattermost-server/v6/app" + tjobs "github.com/mattermost/mattermost-server/v6/jobs/interfaces" ) type PluginsJobInterfaceImpl struct { diff --git a/plugin/scheduler/scheduler.go b/plugin/scheduler/scheduler.go index ada0133f98..3ad4cb465b 100644 --- a/plugin/scheduler/scheduler.go +++ b/plugin/scheduler/scheduler.go @@ -6,9 +6,9 @@ package scheduler import ( "time" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const pluginsJobInterval = 24 * 60 * 60 * time.Second diff --git a/plugin/scheduler/worker.go b/plugin/scheduler/worker.go index 68bbe497ab..9c9b8f6794 100644 --- a/plugin/scheduler/worker.go +++ b/plugin/scheduler/worker.go @@ -4,10 +4,10 @@ package scheduler import ( - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/jobs" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/jobs" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) type Worker struct { diff --git a/plugin/supervisor.go b/plugin/supervisor.go index de1fbf3715..1da4136a73 100644 --- a/plugin/supervisor.go +++ b/plugin/supervisor.go @@ -14,9 +14,9 @@ import ( plugin "github.com/hashicorp/go-plugin" - "github.com/mattermost/mattermost-server/v5/einterfaces" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) type supervisor struct { diff --git a/plugin/supervisor_test.go b/plugin/supervisor_test.go index 921841b704..4492eb3b1a 100644 --- a/plugin/supervisor_test.go +++ b/plugin/supervisor_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/utils" ) func TestSupervisor(t *testing.T) { diff --git a/scripts/config_generator/main.go b/scripts/config_generator/main.go index 9c7b90a9ef..b7641cbbf0 100644 --- a/scripts/config_generator/main.go +++ b/scripts/config_generator/main.go @@ -8,7 +8,7 @@ import ( "fmt" "os" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) // generateDefaultConfig writes default config to outputFile. diff --git a/scripts/config_generator/main_test.go b/scripts/config_generator/main_test.go index 3bc239d3f2..09c22a9691 100644 --- a/scripts/config_generator/main_test.go +++ b/scripts/config_generator/main_test.go @@ -9,7 +9,7 @@ import ( "os" "testing" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" "github.com/stretchr/testify/require" ) diff --git a/services/awsmeter/awsmeter.go b/services/awsmeter/awsmeter.go index 90e6f38b68..b2e1d0ee13 100644 --- a/services/awsmeter/awsmeter.go +++ b/services/awsmeter/awsmeter.go @@ -17,9 +17,9 @@ import ( "github.com/aws/aws-sdk-go/service/marketplacemetering/marketplacemeteringiface" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) type AwsMeter struct { diff --git a/services/awsmeter/awsmeter_test.go b/services/awsmeter/awsmeter_test.go index 9b2d551810..9e22e6effc 100644 --- a/services/awsmeter/awsmeter_test.go +++ b/services/awsmeter/awsmeter_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "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/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) type mockMarketplaceMeteringClient struct { diff --git a/services/cache/cache.go b/services/cache/cache.go index 6e3d1dc03d..05588d0a86 100644 --- a/services/cache/cache.go +++ b/services/cache/cache.go @@ -7,7 +7,7 @@ import ( "errors" "time" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) // ErrKeyNotFound is the error when the given key is not found diff --git a/services/cache/lru.go b/services/cache/lru.go index fdfe37cc81..cb241f3c5a 100644 --- a/services/cache/lru.go +++ b/services/cache/lru.go @@ -11,7 +11,7 @@ import ( "github.com/tinylib/msgp/msgp" "github.com/vmihailenco/msgpack/v5" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) // LRU is a thread-safe fixed size LRU cache. diff --git a/services/cache/lru_striped.go b/services/cache/lru_striped.go index 3b1ace9433..f8bae110bf 100644 --- a/services/cache/lru_striped.go +++ b/services/cache/lru_striped.go @@ -10,7 +10,7 @@ import ( "github.com/cespare/xxhash/v2" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) // LRUStriped keeps LRU caches in buckets in order to lower mutex contention. diff --git a/services/cache/lru_striped_bench_test.go b/services/cache/lru_striped_bench_test.go index 4aab6e9bc3..1126f4835e 100644 --- a/services/cache/lru_striped_bench_test.go +++ b/services/cache/lru_striped_bench_test.go @@ -11,7 +11,7 @@ import ( "github.com/cespare/xxhash/v2" - "github.com/mattermost/mattermost-server/v5/services/cache" + "github.com/mattermost/mattermost-server/v6/services/cache" ) const ( diff --git a/services/cache/lru_striped_test.go b/services/cache/lru_striped_test.go index 2dbdcf3f84..0b40356737 100644 --- a/services/cache/lru_striped_test.go +++ b/services/cache/lru_striped_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func makeLRUPredictibleTestData(num int) [][2]string { diff --git a/services/cache/lru_test.go b/services/cache/lru_test.go index 99b8126b3c..eaf52194ef 100644 --- a/services/cache/lru_test.go +++ b/services/cache/lru_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestLRU(t *testing.T) { diff --git a/services/cache/mocks/Provider.go b/services/cache/mocks/Provider.go index 7515fc09cd..9eb6141708 100644 --- a/services/cache/mocks/Provider.go +++ b/services/cache/mocks/Provider.go @@ -5,7 +5,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - cache "github.com/mattermost/mattermost-server/v5/services/cache" + cache "github.com/mattermost/mattermost-server/v6/services/cache" ) // Provider is an autogenerated mock type for the Provider type diff --git a/services/cache/provider.go b/services/cache/provider.go index 54b2d19aeb..4c6b0e4ca8 100644 --- a/services/cache/provider.go +++ b/services/cache/provider.go @@ -6,7 +6,7 @@ package cache import ( "time" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) // CacheOptions contains options for initializaing a cache diff --git a/services/cache/provider_test.go b/services/cache/provider_test.go index f96eb01598..0962575637 100644 --- a/services/cache/provider_test.go +++ b/services/cache/provider_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" "github.com/stretchr/testify/require" ) diff --git a/services/configservice/configservice.go b/services/configservice/configservice.go index a2978d4d89..67b9ca01a0 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/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) // An interface representing something that contains a Config, such as the app.App struct diff --git a/services/docextractor/combine.go b/services/docextractor/combine.go index 447e749335..c2874f4ae3 100644 --- a/services/docextractor/combine.go +++ b/services/docextractor/combine.go @@ -6,7 +6,7 @@ package docextractor import ( "io" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) type combineExtractor struct { diff --git a/services/docextractor/docextractor_test.go b/services/docextractor/docextractor_test.go index cda8e9fa2d..dd655872aa 100644 --- a/services/docextractor/docextractor_test.go +++ b/services/docextractor/docextractor_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/utils/testutils" + "github.com/mattermost/mattermost-server/v6/utils/testutils" ) func TestExtract(t *testing.T) { diff --git a/services/docextractor/pdf_test.go b/services/docextractor/pdf_test.go index 67106cef3c..1ab7b4c6ce 100644 --- a/services/docextractor/pdf_test.go +++ b/services/docextractor/pdf_test.go @@ -7,7 +7,7 @@ import ( "bytes" "testing" - "github.com/mattermost/mattermost-server/v5/utils/testutils" + "github.com/mattermost/mattermost-server/v6/utils/testutils" "github.com/stretchr/testify/require" ) diff --git a/services/httpservice/httpservice.go b/services/httpservice/httpservice.go index 8aad6e0c97..88c51030f8 100644 --- a/services/httpservice/httpservice.go +++ b/services/httpservice/httpservice.go @@ -10,7 +10,7 @@ import ( "time" "unicode" - "github.com/mattermost/mattermost-server/v5/services/configservice" + "github.com/mattermost/mattermost-server/v6/services/configservice" ) // HTTPService wraps the functionality for making http requests to provide some improvements to the default client diff --git a/services/imageproxy/atmos_camo_test.go b/services/imageproxy/atmos_camo_test.go index 6807415b3b..0f19290857 100644 --- a/services/imageproxy/atmos_camo_test.go +++ b/services/imageproxy/atmos_camo_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "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/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/httpservice" + "github.com/mattermost/mattermost-server/v6/utils/testutils" ) func makeTestAtmosCamoProxy() *ImageProxy { diff --git a/services/imageproxy/imageproxy.go b/services/imageproxy/imageproxy.go index 8cea50c421..d9c8e1c05a 100644 --- a/services/imageproxy/imageproxy.go +++ b/services/imageproxy/imageproxy.go @@ -11,10 +11,10 @@ import ( "strings" "sync" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/configservice" - "github.com/mattermost/mattermost-server/v5/services/httpservice" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/configservice" + "github.com/mattermost/mattermost-server/v6/services/httpservice" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) var ErrNotEnabled = Error{errors.New("imageproxy.ImageProxy: image proxy not enabled")} diff --git a/services/imageproxy/local.go b/services/imageproxy/local.go index 98216326db..e3379d30d9 100644 --- a/services/imageproxy/local.go +++ b/services/imageproxy/local.go @@ -16,8 +16,8 @@ import ( "willnorris.com/go/imageproxy" - "github.com/mattermost/mattermost-server/v5/services/httpservice" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/services/httpservice" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) var imageContentTypes = []string{ diff --git a/services/imageproxy/local_test.go b/services/imageproxy/local_test.go index 3065c72682..0f82bd453e 100644 --- a/services/imageproxy/local_test.go +++ b/services/imageproxy/local_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "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/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/httpservice" + "github.com/mattermost/mattermost-server/v6/utils/testutils" ) func makeTestLocalProxy() *ImageProxy { diff --git a/services/marketplace/client.go b/services/marketplace/client.go index 7a0263e0cf..d119851c81 100644 --- a/services/marketplace/client.go +++ b/services/marketplace/client.go @@ -13,8 +13,8 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/httpservice" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/httpservice" ) // Client is the programmatic interface to the marketplace server API. diff --git a/services/remotecluster/invitation.go b/services/remotecluster/invitation.go index 4f4aecd241..73cbeb4fa2 100644 --- a/services/remotecluster/invitation.go +++ b/services/remotecluster/invitation.go @@ -8,7 +8,7 @@ import ( "errors" "fmt" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) // AcceptInvitation is called when accepting an invitation to connect with a remote cluster. diff --git a/services/remotecluster/mocks_test.go b/services/remotecluster/mocks_test.go index 5f722ae355..468396dfd1 100644 --- a/services/remotecluster/mocks_test.go +++ b/services/remotecluster/mocks_test.go @@ -12,12 +12,12 @@ import ( "go.uber.org/zap/zapcore" - "github.com/mattermost/mattermost-server/v5/einterfaces" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" - "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) type mockServer struct { diff --git a/services/remotecluster/ping.go b/services/remotecluster/ping.go index 87d0d55d03..5bc6751dd5 100644 --- a/services/remotecluster/ping.go +++ b/services/remotecluster/ping.go @@ -8,8 +8,8 @@ import ( "fmt" "time" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) // pingLoop periodically sends a ping to all remote clusters. diff --git a/services/remotecluster/ping_test.go b/services/remotecluster/ping_test.go index a0ba1ea673..bb985e730c 100644 --- a/services/remotecluster/ping_test.go +++ b/services/remotecluster/ping_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/require" "github.com/wiggin77/merror" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) const ( diff --git a/services/remotecluster/recv.go b/services/remotecluster/recv.go index cafa7d206c..6c827afe52 100644 --- a/services/remotecluster/recv.go +++ b/services/remotecluster/recv.go @@ -6,8 +6,8 @@ package remotecluster import ( "fmt" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) // ReceiveIncomingMsg is called by the Rest API layer, or websocket layer (future), when a Remote Cluster diff --git a/services/remotecluster/send_test.go b/services/remotecluster/send_test.go index 115f281ea0..a132bdfb91 100644 --- a/services/remotecluster/send_test.go +++ b/services/remotecluster/send_test.go @@ -18,7 +18,7 @@ import ( "github.com/stretchr/testify/require" "github.com/wiggin77/merror" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) const ( diff --git a/services/remotecluster/sendfile.go b/services/remotecluster/sendfile.go index 14df04c17e..87afb0d169 100644 --- a/services/remotecluster/sendfile.go +++ b/services/remotecluster/sendfile.go @@ -13,9 +13,9 @@ import ( "path" "time" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/filestore" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/filestore" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) type SendFileResultFunc func(us *model.UploadSession, rc *model.RemoteCluster, resp *Response, err error) diff --git a/services/remotecluster/sendmsg.go b/services/remotecluster/sendmsg.go index 5a03f0cf22..2b66cdcb6a 100644 --- a/services/remotecluster/sendmsg.go +++ b/services/remotecluster/sendmsg.go @@ -17,8 +17,8 @@ import ( "github.com/wiggin77/merror" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) type SendMsgResultFunc func(msg model.RemoteClusterMsg, rc *model.RemoteCluster, resp *Response, err error) diff --git a/services/remotecluster/sendprofileImage.go b/services/remotecluster/sendprofileImage.go index 85e7828929..73331941a4 100644 --- a/services/remotecluster/sendprofileImage.go +++ b/services/remotecluster/sendprofileImage.go @@ -15,8 +15,8 @@ import ( "path" "time" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) type SendProfileImageResultFunc func(userId string, rc *model.RemoteCluster, resp *Response, err error) diff --git a/services/remotecluster/sendprofileImage_test.go b/services/remotecluster/sendprofileImage_test.go index 144dcda2f9..6f433383cf 100644 --- a/services/remotecluster/sendprofileImage_test.go +++ b/services/remotecluster/sendprofileImage_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) const ( diff --git a/services/remotecluster/service.go b/services/remotecluster/service.go index 397267008c..c96b8f7f77 100644 --- a/services/remotecluster/service.go +++ b/services/remotecluster/service.go @@ -10,10 +10,10 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/v5/einterfaces" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) const ( diff --git a/services/remotecluster/service_test.go b/services/remotecluster/service_test.go index 2895d6c475..856439ba3a 100644 --- a/services/remotecluster/service_test.go +++ b/services/remotecluster/service_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestService_AddTopicListener(t *testing.T) { diff --git a/services/searchengine/bleveengine/bleve.go b/services/searchengine/bleveengine/bleve.go index a4ca106cc1..3c4fb139a5 100644 --- a/services/searchengine/bleveengine/bleve.go +++ b/services/searchengine/bleveengine/bleve.go @@ -17,9 +17,9 @@ import ( "github.com/blevesearch/bleve/analysis/analyzer/standard" "github.com/blevesearch/bleve/mapping" - "github.com/mattermost/mattermost-server/v5/jobs" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/jobs" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const ( diff --git a/services/searchengine/bleveengine/bleve_test.go b/services/searchengine/bleveengine/bleve_test.go index acee18c1b9..40bffbf79c 100644 --- a/services/searchengine/bleveengine/bleve_test.go +++ b/services/searchengine/bleveengine/bleve_test.go @@ -12,13 +12,13 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/searchengine" - "github.com/mattermost/mattermost-server/v5/store/searchlayer" - "github.com/mattermost/mattermost-server/v5/store/searchtest" - "github.com/mattermost/mattermost-server/v5/store/sqlstore" - "github.com/mattermost/mattermost-server/v5/store/storetest" - "github.com/mattermost/mattermost-server/v5/testlib" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/searchengine" + "github.com/mattermost/mattermost-server/v6/store/searchlayer" + "github.com/mattermost/mattermost-server/v6/store/searchtest" + "github.com/mattermost/mattermost-server/v6/store/sqlstore" + "github.com/mattermost/mattermost-server/v6/store/storetest" + "github.com/mattermost/mattermost-server/v6/testlib" ) type BleveEngineTestSuite struct { diff --git a/services/searchengine/bleveengine/common.go b/services/searchengine/bleveengine/common.go index ef4b125d93..47bc7ad93b 100644 --- a/services/searchengine/bleveengine/common.go +++ b/services/searchengine/bleveengine/common.go @@ -6,8 +6,8 @@ package bleveengine import ( "strings" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/searchengine" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/searchengine" ) type BLVChannel struct { diff --git a/services/searchengine/bleveengine/indexer/indexing_job.go b/services/searchengine/bleveengine/indexer/indexing_job.go index 0b99f1c4f1..7cd40170db 100644 --- a/services/searchengine/bleveengine/indexer/indexing_job.go +++ b/services/searchengine/bleveengine/indexer/indexing_job.go @@ -9,12 +9,12 @@ import ( "strconv" "time" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/jobs" - tjobs "github.com/mattermost/mattermost-server/v5/jobs/interfaces" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/searchengine/bleveengine" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/jobs" + tjobs "github.com/mattermost/mattermost-server/v6/jobs/interfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/searchengine/bleveengine" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const ( diff --git a/services/searchengine/bleveengine/indexer/indexing_job_test.go b/services/searchengine/bleveengine/indexer/indexing_job_test.go index 54dec0d137..7f289c42e1 100644 --- a/services/searchengine/bleveengine/indexer/indexing_job_test.go +++ b/services/searchengine/bleveengine/indexer/indexing_job_test.go @@ -9,11 +9,11 @@ import ( "os" "testing" - "github.com/mattermost/mattermost-server/v5/jobs" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/searchengine/bleveengine" - "github.com/mattermost/mattermost-server/v5/store/storetest" - "github.com/mattermost/mattermost-server/v5/utils/testutils" + "github.com/mattermost/mattermost-server/v6/jobs" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/searchengine/bleveengine" + "github.com/mattermost/mattermost-server/v6/store/storetest" + "github.com/mattermost/mattermost-server/v6/utils/testutils" "github.com/stretchr/testify/require" ) diff --git a/services/searchengine/bleveengine/search.go b/services/searchengine/bleveengine/search.go index 7eab18541c..2530923508 100644 --- a/services/searchengine/bleveengine/search.go +++ b/services/searchengine/bleveengine/search.go @@ -10,8 +10,8 @@ import ( "github.com/blevesearch/bleve" "github.com/blevesearch/bleve/search/query" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const DeletePostsBatchSize = 500 diff --git a/services/searchengine/bleveengine/testlib.go b/services/searchengine/bleveengine/testlib.go index f4fb96c75c..5c03856bb2 100644 --- a/services/searchengine/bleveengine/testlib.go +++ b/services/searchengine/bleveengine/testlib.go @@ -6,7 +6,7 @@ package bleveengine import ( "fmt" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func createPost(userId string, channelId string) *model.Post { diff --git a/services/searchengine/interface.go b/services/searchengine/interface.go index 2fde8eec63..7d5312e134 100644 --- a/services/searchengine/interface.go +++ b/services/searchengine/interface.go @@ -6,7 +6,7 @@ package searchengine import ( "time" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type SearchEngineInterface interface { diff --git a/services/searchengine/mocks/SearchEngineInterface.go b/services/searchengine/mocks/SearchEngineInterface.go index 40c95d96bb..ec65edb027 100644 --- a/services/searchengine/mocks/SearchEngineInterface.go +++ b/services/searchengine/mocks/SearchEngineInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" time "time" diff --git a/services/searchengine/searchengine.go b/services/searchengine/searchengine.go index 785edaabfb..4eebadda72 100644 --- a/services/searchengine/searchengine.go +++ b/services/searchengine/searchengine.go @@ -4,8 +4,8 @@ package searchengine import ( - "github.com/mattermost/mattermost-server/v5/jobs" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/jobs" + "github.com/mattermost/mattermost-server/v6/model" ) func NewBroker(cfg *model.Config, jobServer *jobs.JobServer) *Broker { diff --git a/services/searchengine/utils.go b/services/searchengine/utils.go index 3b8b5491e5..dd872046da 100644 --- a/services/searchengine/utils.go +++ b/services/searchengine/utils.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/utils" ) var EmailRegex = regexp.MustCompile(`^[^\s"]+@[^\s"]+$`) diff --git a/services/sharedchannel/attachment.go b/services/sharedchannel/attachment.go index 9382b78456..aec5d311f0 100644 --- a/services/sharedchannel/attachment.go +++ b/services/sharedchannel/attachment.go @@ -10,9 +10,9 @@ import ( "fmt" "sync" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/remotecluster" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/remotecluster" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) // postsToAttachments returns the file attachments for a slice of posts that need to be synchronized. diff --git a/services/sharedchannel/channelinvite.go b/services/sharedchannel/channelinvite.go index c17f0fc7f4..0ac7e0df64 100644 --- a/services/sharedchannel/channelinvite.go +++ b/services/sharedchannel/channelinvite.go @@ -9,10 +9,10 @@ import ( "fmt" "strings" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/remotecluster" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/remotecluster" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) // channelInviteMsg represents an invitation for a remote cluster to start sharing a channel. diff --git a/services/sharedchannel/channelinvite_test.go b/services/sharedchannel/channelinvite_test.go index 53cee2c4d5..3a58b10f29 100644 --- a/services/sharedchannel/channelinvite_test.go +++ b/services/sharedchannel/channelinvite_test.go @@ -13,10 +13,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) type mockLogger struct { diff --git a/services/sharedchannel/mock_AppIface_test.go b/services/sharedchannel/mock_AppIface_test.go index 6090808c62..94d6dac2eb 100644 --- a/services/sharedchannel/mock_AppIface_test.go +++ b/services/sharedchannel/mock_AppIface_test.go @@ -5,12 +5,12 @@ package sharedchannel import ( - filestore "github.com/mattermost/mattermost-server/v5/shared/filestore" + filestore "github.com/mattermost/mattermost-server/v6/shared/filestore" mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" - request "github.com/mattermost/mattermost-server/v5/app/request" + request "github.com/mattermost/mattermost-server/v6/app/request" ) // MockAppIface is an autogenerated mock type for the AppIface type diff --git a/services/sharedchannel/mock_ServerIface_test.go b/services/sharedchannel/mock_ServerIface_test.go index a33159c116..891268d2a9 100644 --- a/services/sharedchannel/mock_ServerIface_test.go +++ b/services/sharedchannel/mock_ServerIface_test.go @@ -5,14 +5,14 @@ package sharedchannel import ( - mlog "github.com/mattermost/mattermost-server/v5/shared/mlog" + mlog "github.com/mattermost/mattermost-server/v6/shared/mlog" mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" - remotecluster "github.com/mattermost/mattermost-server/v5/services/remotecluster" + remotecluster "github.com/mattermost/mattermost-server/v6/services/remotecluster" - store "github.com/mattermost/mattermost-server/v5/store" + store "github.com/mattermost/mattermost-server/v6/store" ) // MockServerIface is an autogenerated mock type for the ServerIface type diff --git a/services/sharedchannel/msg.go b/services/sharedchannel/msg.go index a1bdd62792..90d76d2c7e 100644 --- a/services/sharedchannel/msg.go +++ b/services/sharedchannel/msg.go @@ -6,7 +6,7 @@ package sharedchannel import ( "encoding/json" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) // syncMsg represents a change in content (post add/edit/delete, reaction add/remove, users). diff --git a/services/sharedchannel/permalink.go b/services/sharedchannel/permalink.go index 163f077fcc..2a0a13dba2 100644 --- a/services/sharedchannel/permalink.go +++ b/services/sharedchannel/permalink.go @@ -9,9 +9,9 @@ import ( "regexp" "strings" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) var ( diff --git a/services/sharedchannel/permalink_test.go b/services/sharedchannel/permalink_test.go index 95e3d90af5..d8640f7a99 100644 --- a/services/sharedchannel/permalink_test.go +++ b/services/sharedchannel/permalink_test.go @@ -10,10 +10,10 @@ import ( "github.com/stretchr/testify/assert" - "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" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v6/utils" ) func TestProcessPermalinkToRemote(t *testing.T) { diff --git a/services/sharedchannel/service.go b/services/sharedchannel/service.go index e0dc0c8d01..a24bd18f81 100644 --- a/services/sharedchannel/service.go +++ b/services/sharedchannel/service.go @@ -10,12 +10,12 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/remotecluster" - "github.com/mattermost/mattermost-server/v5/shared/filestore" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/remotecluster" + "github.com/mattermost/mattermost-server/v6/shared/filestore" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) const ( diff --git a/services/sharedchannel/sync_recv.go b/services/sharedchannel/sync_recv.go index 990b34a06d..f8618f3dda 100644 --- a/services/sharedchannel/sync_recv.go +++ b/services/sharedchannel/sync_recv.go @@ -11,10 +11,10 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/remotecluster" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/remotecluster" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) func (scs *Service) onReceiveSyncMessage(msg model.RemoteClusterMsg, rc *model.RemoteCluster, response *remotecluster.Response) error { diff --git a/services/sharedchannel/sync_send.go b/services/sharedchannel/sync_send.go index 470cbd056c..ff12daeb85 100644 --- a/services/sharedchannel/sync_send.go +++ b/services/sharedchannel/sync_send.go @@ -8,10 +8,10 @@ import ( "fmt" "time" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/remotecluster" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/remotecluster" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) type syncTask struct { diff --git a/services/sharedchannel/sync_send_remote.go b/services/sharedchannel/sync_send_remote.go index 7cabd69530..0db2250da9 100644 --- a/services/sharedchannel/sync_send_remote.go +++ b/services/sharedchannel/sync_send_remote.go @@ -11,9 +11,9 @@ import ( "github.com/wiggin77/merror" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/remotecluster" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/remotecluster" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) type sendSyncMsgResultFunc func(syncResp SyncResponse, err error) diff --git a/services/sharedchannel/util.go b/services/sharedchannel/util.go index 77a0d4eff9..b8c0b124ad 100644 --- a/services/sharedchannel/util.go +++ b/services/sharedchannel/util.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) // fixMention replaces any mentions in a post for the user with the user's real username. diff --git a/services/slackimport/converters.go b/services/slackimport/converters.go index 0317837ef2..2dcb5232b3 100644 --- a/services/slackimport/converters.go +++ b/services/slackimport/converters.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) func slackConvertTimeStamp(ts string) int64 { diff --git a/services/slackimport/main_test.go b/services/slackimport/main_test.go index 4ef93c9419..2d940e5d00 100644 --- a/services/slackimport/main_test.go +++ b/services/slackimport/main_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) func TestMain(m *testing.M) { diff --git a/services/slackimport/parsers.go b/services/slackimport/parsers.go index 95d0cc7fdb..f3eab0ab1a 100644 --- a/services/slackimport/parsers.go +++ b/services/slackimport/parsers.go @@ -7,8 +7,8 @@ import ( "encoding/json" "io" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) func slackParseChannels(data io.Reader, channelType model.ChannelType) ([]slackChannel, error) { diff --git a/services/slackimport/slackimport.go b/services/slackimport/slackimport.go index 6d6a534234..a21c1c441c 100644 --- a/services/slackimport/slackimport.go +++ b/services/slackimport/slackimport.go @@ -17,11 +17,11 @@ import ( "time" "unicode/utf8" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/utils" ) type slackChannel struct { diff --git a/services/slackimport/slackimport_test.go b/services/slackimport/slackimport_test.go index b1d56a54be..a19f15c353 100644 --- a/services/slackimport/slackimport_test.go +++ b/services/slackimport/slackimport_test.go @@ -11,8 +11,8 @@ import ( "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/mocks" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) func TestSlackConvertTimeStamp(t *testing.T) { diff --git a/services/telemetry/mocks/ServerIface.go b/services/telemetry/mocks/ServerIface.go index 5f3ae19fe4..dbf28265f8 100644 --- a/services/telemetry/mocks/ServerIface.go +++ b/services/telemetry/mocks/ServerIface.go @@ -7,12 +7,12 @@ package mocks import ( context "context" - httpservice "github.com/mattermost/mattermost-server/v5/services/httpservice" + httpservice "github.com/mattermost/mattermost-server/v6/services/httpservice" mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" - plugin "github.com/mattermost/mattermost-server/v5/plugin" + plugin "github.com/mattermost/mattermost-server/v6/plugin" ) // ServerIface is an autogenerated mock type for the ServerIface type diff --git a/services/telemetry/telemetry.go b/services/telemetry/telemetry.go index 92ee5d8465..96292fdf9f 100644 --- a/services/telemetry/telemetry.go +++ b/services/telemetry/telemetry.go @@ -13,14 +13,14 @@ import ( rudder "github.com/rudderlabs/analytics-go" - "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/marketplace" - "github.com/mattermost/mattermost-server/v5/services/searchengine" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/services/httpservice" + "github.com/mattermost/mattermost-server/v6/services/marketplace" + "github.com/mattermost/mattermost-server/v6/services/searchengine" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/utils" ) const ( diff --git a/services/telemetry/telemetry_test.go b/services/telemetry/telemetry_test.go index d026154d17..d8a46f9dbd 100644 --- a/services/telemetry/telemetry_test.go +++ b/services/telemetry/telemetry_test.go @@ -19,14 +19,14 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "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/services/httpservice" - "github.com/mattermost/mattermost-server/v5/services/searchengine" - "github.com/mattermost/mattermost-server/v5/services/telemetry/mocks" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - storeMocks "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/plugin/plugintest" + "github.com/mattermost/mattermost-server/v6/services/httpservice" + "github.com/mattermost/mattermost-server/v6/services/searchengine" + "github.com/mattermost/mattermost-server/v6/services/telemetry/mocks" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + storeMocks "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) type FakeConfigService struct { diff --git a/services/tracing/tracing.go b/services/tracing/tracing.go index 6b9954a6e4..b2d129e0e1 100644 --- a/services/tracing/tracing.go +++ b/services/tracing/tracing.go @@ -14,7 +14,7 @@ import ( "github.com/uber/jaeger-client-go/zipkin" "github.com/uber/jaeger-lib/metrics" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) // Tracer is a wrapper around Jaeger OpenTracing client, used to properly de-initialize jaeger on exit diff --git a/services/upgrader/upgrader_linux.go b/services/upgrader/upgrader_linux.go index d33bb6d14b..edbdd6cbf0 100644 --- a/services/upgrader/upgrader_linux.go +++ b/services/upgrader/upgrader_linux.go @@ -23,8 +23,8 @@ import ( "github.com/pkg/errors" "golang.org/x/crypto/openpgp" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const mattermostBuildPublicKey = `-----BEGIN PGP PUBLIC KEY BLOCK----- diff --git a/services/upgrader/upgrader_linux_test.go b/services/upgrader/upgrader_linux_test.go index 335b303a1c..5c9d1b2a49 100644 --- a/services/upgrader/upgrader_linux_test.go +++ b/services/upgrader/upgrader_linux_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestCanIUpgradeToE0(t *testing.T) { diff --git a/services/users/helper_test.go b/services/users/helper_test.go index ce060cbcd6..94375778f0 100644 --- a/services/users/helper_test.go +++ b/services/users/helper_test.go @@ -12,11 +12,11 @@ import ( "sync" "testing" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/config" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/cache" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/config" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/cache" + "github.com/mattermost/mattermost-server/v6/store" ) var initBasicOnce sync.Once diff --git a/services/users/main_test.go b/services/users/main_test.go index 253707abab..6a031adee5 100644 --- a/services/users/main_test.go +++ b/services/users/main_test.go @@ -7,8 +7,8 @@ import ( "flag" "testing" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/testlib" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/testlib" ) var mainHelper *testlib.MainHelper diff --git a/services/users/password.go b/services/users/password.go index 5e698e93e0..4a27efd0b6 100644 --- a/services/users/password.go +++ b/services/users/password.go @@ -7,7 +7,7 @@ import ( "errors" "strings" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" "golang.org/x/crypto/bcrypt" ) diff --git a/services/users/password_test.go b/services/users/password_test.go index 8ffc6491d2..500abb14a1 100644 --- a/services/users/password_test.go +++ b/services/users/password_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestComparePassword(t *testing.T) { diff --git a/services/users/profile_picture.go b/services/users/profile_picture.go index c07eb9b0ef..fbd413f52b 100644 --- a/services/users/profile_picture.go +++ b/services/users/profile_picture.go @@ -18,9 +18,9 @@ import ( "github.com/golang/freetype" "github.com/golang/freetype/truetype" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/filestore" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/filestore" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) const ( diff --git a/services/users/service.go b/services/users/service.go index 7c9b26662c..8a61e31fe8 100644 --- a/services/users/service.go +++ b/services/users/service.go @@ -9,10 +9,10 @@ import ( "runtime" "sync" - "github.com/mattermost/mattermost-server/v5/einterfaces" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/cache" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/cache" + "github.com/mattermost/mattermost-server/v6/store" ) type UserService struct { diff --git a/services/users/service_test.go b/services/users/service_test.go index 20a9f5bc15..59c3eae3bc 100644 --- a/services/users/service_test.go +++ b/services/users/service_test.go @@ -6,7 +6,7 @@ package users import ( "testing" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" "github.com/stretchr/testify/require" ) diff --git a/services/users/session.go b/services/users/session.go index 0b63e4b2f5..b2cd720287 100644 --- a/services/users/session.go +++ b/services/users/session.go @@ -8,9 +8,9 @@ import ( "fmt" "time" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store/sqlstore" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store/sqlstore" "github.com/pkg/errors" ) diff --git a/services/users/session_test.go b/services/users/session_test.go index 3b156ff21b..cee66b9af1 100644 --- a/services/users/session_test.go +++ b/services/users/session_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" "github.com/stretchr/testify/require" ) diff --git a/services/users/users.go b/services/users/users.go index 9d1f8c48d3..c850c3c32d 100644 --- a/services/users/users.go +++ b/services/users/users.go @@ -8,11 +8,11 @@ import ( "encoding/base64" "fmt" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mfa" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mfa" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) type UserCreateOptions struct { diff --git a/services/users/utils.go b/services/users/utils.go index f9403f0794..d9356f0763 100644 --- a/services/users/utils.go +++ b/services/users/utils.go @@ -6,7 +6,7 @@ package users import ( "strings" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func maxInt(a, b int) int { diff --git a/shared/driver/conn.go b/shared/driver/conn.go index c3cfa0e548..6acf8e8762 100644 --- a/shared/driver/conn.go +++ b/shared/driver/conn.go @@ -7,7 +7,7 @@ import ( "context" "database/sql/driver" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/plugin" ) // Conn is a DB driver conn implementation diff --git a/shared/driver/driver.go b/shared/driver/driver.go index 3093db8e39..2f6f6c3b7a 100644 --- a/shared/driver/driver.go +++ b/shared/driver/driver.go @@ -12,7 +12,7 @@ import ( "context" "database/sql/driver" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/plugin" ) var ( diff --git a/shared/driver/objects.go b/shared/driver/objects.go index f6c5ef19e5..ff28cb2ed5 100644 --- a/shared/driver/objects.go +++ b/shared/driver/objects.go @@ -7,7 +7,7 @@ import ( "context" "database/sql/driver" - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/plugin" ) type wrapperTx struct { diff --git a/shared/filestore/filesstore_test.go b/shared/filestore/filesstore_test.go index d9fbb3e127..dd53768e08 100644 --- a/shared/filestore/filesstore_test.go +++ b/shared/filestore/filesstore_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/suite" "github.com/xtgo/uuid" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) func randomString() string { diff --git a/shared/filestore/localstore.go b/shared/filestore/localstore.go index 6cd8c4ca99..5ed882de25 100644 --- a/shared/filestore/localstore.go +++ b/shared/filestore/localstore.go @@ -13,7 +13,7 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const ( diff --git a/shared/filestore/mocks/FileBackend.go b/shared/filestore/mocks/FileBackend.go index 7679a85319..2bc0c7a700 100644 --- a/shared/filestore/mocks/FileBackend.go +++ b/shared/filestore/mocks/FileBackend.go @@ -7,7 +7,7 @@ package mocks import ( io "io" - filestore "github.com/mattermost/mattermost-server/v5/shared/filestore" + filestore "github.com/mattermost/mattermost-server/v6/shared/filestore" mock "github.com/stretchr/testify/mock" diff --git a/shared/filestore/s3store.go b/shared/filestore/s3store.go index 5d0bf38e65..f938f4d53e 100644 --- a/shared/filestore/s3store.go +++ b/shared/filestore/s3store.go @@ -17,7 +17,7 @@ import ( "github.com/minio/minio-go/v7/pkg/encrypt" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) // S3FileBackend contains all necessary information to communicate with diff --git a/shared/i18n/i18n.go b/shared/i18n/i18n.go index a5de30bbf3..0168b751d0 100644 --- a/shared/i18n/i18n.go +++ b/shared/i18n/i18n.go @@ -14,7 +14,7 @@ import ( "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const defaultLocale = "en" diff --git a/shared/mail/mail.go b/shared/mail/mail.go index e915623f43..8ca1db48bf 100644 --- a/shared/mail/mail.go +++ b/shared/mail/mail.go @@ -17,7 +17,7 @@ import ( "github.com/pkg/errors" gomail "gopkg.in/mail.v2" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const ( diff --git a/shared/mfa/mfa_test.go b/shared/mfa/mfa_test.go index f63eaa0e42..448175259b 100644 --- a/shared/mfa/mfa_test.go +++ b/shared/mfa/mfa_test.go @@ -12,8 +12,8 @@ import ( "time" "github.com/dgryski/dgoogauth" - "github.com/mattermost/mattermost-server/v5/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/shared/mlog/global_test.go b/shared/mlog/global_test.go index 7da9e62aaa..8589d1a8b7 100644 --- a/shared/mlog/global_test.go +++ b/shared/mlog/global_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) func TestLoggingBeforeInitialized(t *testing.T) { diff --git a/shared/mlog/human/entry.go b/shared/mlog/human/entry.go index b5c69e9af8..1a49fdcaca 100644 --- a/shared/mlog/human/entry.go +++ b/shared/mlog/human/entry.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) type LogEntry struct { diff --git a/shared/mlog/human/parser.go b/shared/mlog/human/parser.go index 7898a77f0d..b4b45505df 100644 --- a/shared/mlog/human/parser.go +++ b/shared/mlog/human/parser.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) func ParseLogMessage(msg string) LogEntry { diff --git a/shared/mlog/log_test.go b/shared/mlog/log_test.go index 4b018285d4..cda0498625 100644 --- a/shared/mlog/log_test.go +++ b/shared/mlog/log_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) // Test race condition when shutting down advanced logging. This test must run with the -race flag in order to verify diff --git a/shared/templates/templates.go b/shared/templates/templates.go index 9d1581af7b..73e1b4a665 100644 --- a/shared/templates/templates.go +++ b/shared/templates/templates.go @@ -12,7 +12,7 @@ import ( "sync" "github.com/fsnotify/fsnotify" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) // Container represents a set of templates that can be render diff --git a/store/layer_generators/opentracing_layer.go.tmpl b/store/layer_generators/opentracing_layer.go.tmpl index 1fcbc3e885..b6ac76bc17 100644 --- a/store/layer_generators/opentracing_layer.go.tmpl +++ b/store/layer_generators/opentracing_layer.go.tmpl @@ -9,9 +9,9 @@ package opentracinglayer import ( "context" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/tracing" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/tracing" + "github.com/mattermost/mattermost-server/v6/store" "github.com/opentracing/opentracing-go/ext" spanlog "github.com/opentracing/opentracing-go/log" ) diff --git a/store/layer_generators/retry_layer.go.tmpl b/store/layer_generators/retry_layer.go.tmpl index 7c9c136b31..0e25465c8e 100644 --- a/store/layer_generators/retry_layer.go.tmpl +++ b/store/layer_generators/retry_layer.go.tmpl @@ -10,8 +10,8 @@ import ( "context" "github.com/lib/pq" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" "github.com/pkg/errors" "github.com/go-sql-driver/mysql" ) diff --git a/store/layer_generators/timer_layer.go.tmpl b/store/layer_generators/timer_layer.go.tmpl index 433293c054..30879275e8 100644 --- a/store/layer_generators/timer_layer.go.tmpl +++ b/store/layer_generators/timer_layer.go.tmpl @@ -10,9 +10,9 @@ import ( "context" timemodule "time" - "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/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type {{.Name}} struct { diff --git a/store/localcachelayer/channel_layer.go b/store/localcachelayer/channel_layer.go index f2bfdde81d..527567736d 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/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type LocalCacheChannelStore struct { diff --git a/store/localcachelayer/channel_layer_test.go b/store/localcachelayer/channel_layer_test.go index 054aeaf909..0073cbade5 100644 --- a/store/localcachelayer/channel_layer_test.go +++ b/store/localcachelayer/channel_layer_test.go @@ -9,9 +9,9 @@ import ( "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" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) func TestChannelStore(t *testing.T) { diff --git a/store/localcachelayer/emoji_layer.go b/store/localcachelayer/emoji_layer.go index cbc563b701..8da7af5482 100644 --- a/store/localcachelayer/emoji_layer.go +++ b/store/localcachelayer/emoji_layer.go @@ -7,9 +7,9 @@ import ( "context" "sync" - "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/store/sqlstore" ) type LocalCacheEmojiStore struct { diff --git a/store/localcachelayer/emoji_layer_test.go b/store/localcachelayer/emoji_layer_test.go index 012c787962..edaea1ecb9 100644 --- a/store/localcachelayer/emoji_layer_test.go +++ b/store/localcachelayer/emoji_layer_test.go @@ -10,9 +10,9 @@ import ( "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" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) func TestEmojiStore(t *testing.T) { diff --git a/store/localcachelayer/file_info_layer.go b/store/localcachelayer/file_info_layer.go index 43d80f3b23..b11de6c436 100644 --- a/store/localcachelayer/file_info_layer.go +++ b/store/localcachelayer/file_info_layer.go @@ -4,8 +4,8 @@ package localcachelayer import ( - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type LocalCacheFileInfoStore struct { diff --git a/store/localcachelayer/file_info_layer_test.go b/store/localcachelayer/file_info_layer_test.go index e011d92e55..f2fb6572ca 100644 --- a/store/localcachelayer/file_info_layer_test.go +++ b/store/localcachelayer/file_info_layer_test.go @@ -9,9 +9,9 @@ import ( "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" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) func TestFileInfoStore(t *testing.T) { diff --git a/store/localcachelayer/layer.go b/store/localcachelayer/layer.go index 08e997dd74..a619834cac 100644 --- a/store/localcachelayer/layer.go +++ b/store/localcachelayer/layer.go @@ -7,10 +7,10 @@ import ( "runtime" "time" - "github.com/mattermost/mattermost-server/v5/einterfaces" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/cache" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/cache" + "github.com/mattermost/mattermost-server/v6/store" ) const ( diff --git a/store/localcachelayer/layer_test.go b/store/localcachelayer/layer_test.go index da0572b000..4b6442e37c 100644 --- a/store/localcachelayer/layer_test.go +++ b/store/localcachelayer/layer_test.go @@ -8,10 +8,10 @@ import ( "sync" "testing" - "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/store/sqlstore" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) type storeType struct { diff --git a/store/localcachelayer/main_test.go b/store/localcachelayer/main_test.go index c9cee272f2..d492bb3f92 100644 --- a/store/localcachelayer/main_test.go +++ b/store/localcachelayer/main_test.go @@ -10,14 +10,14 @@ import ( "github.com/stretchr/testify/mock" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/cache" - cachemocks "github.com/mattermost/mattermost-server/v5/services/cache/mocks" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" - "github.com/mattermost/mattermost-server/v5/store/sqlstore" - "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v5/testlib" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/cache" + cachemocks "github.com/mattermost/mattermost-server/v6/services/cache/mocks" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/store/sqlstore" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v6/testlib" ) var mainHelper *testlib.MainHelper diff --git a/store/localcachelayer/post_layer.go b/store/localcachelayer/post_layer.go index 125d4a4f28..4f2886b0d1 100644 --- a/store/localcachelayer/post_layer.go +++ b/store/localcachelayer/post_layer.go @@ -8,8 +8,8 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type LocalCachePostStore struct { diff --git a/store/localcachelayer/post_layer_test.go b/store/localcachelayer/post_layer_test.go index 3ed2701cf1..bef4991949 100644 --- a/store/localcachelayer/post_layer_test.go +++ b/store/localcachelayer/post_layer_test.go @@ -10,9 +10,9 @@ import ( "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" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) func TestPostStore(t *testing.T) { diff --git a/store/localcachelayer/reaction_layer.go b/store/localcachelayer/reaction_layer.go index 795112e2d8..9d309df2d8 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/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type LocalCacheReactionStore struct { diff --git a/store/localcachelayer/reaction_layer_test.go b/store/localcachelayer/reaction_layer_test.go index 25daefb928..df0876c38b 100644 --- a/store/localcachelayer/reaction_layer_test.go +++ b/store/localcachelayer/reaction_layer_test.go @@ -9,9 +9,9 @@ import ( "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" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) func TestReactionStore(t *testing.T) { diff --git a/store/localcachelayer/role_layer.go b/store/localcachelayer/role_layer.go index b193f747e8..44f60102a0 100644 --- a/store/localcachelayer/role_layer.go +++ b/store/localcachelayer/role_layer.go @@ -8,8 +8,8 @@ import ( "sort" "strings" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type LocalCacheRoleStore struct { diff --git a/store/localcachelayer/role_layer_test.go b/store/localcachelayer/role_layer_test.go index 2366ca570c..164012dda0 100644 --- a/store/localcachelayer/role_layer_test.go +++ b/store/localcachelayer/role_layer_test.go @@ -10,9 +10,9 @@ import ( "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" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) func TestRoleStore(t *testing.T) { diff --git a/store/localcachelayer/scheme_layer.go b/store/localcachelayer/scheme_layer.go index cfee4c0dfc..ae74cdeaf6 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/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type LocalCacheSchemeStore struct { diff --git a/store/localcachelayer/scheme_layer_test.go b/store/localcachelayer/scheme_layer_test.go index 519558b872..5ced6262fb 100644 --- a/store/localcachelayer/scheme_layer_test.go +++ b/store/localcachelayer/scheme_layer_test.go @@ -9,9 +9,9 @@ import ( "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" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) func TestSchemeStore(t *testing.T) { diff --git a/store/localcachelayer/team_layer.go b/store/localcachelayer/team_layer.go index 25de28eb51..17f32a5caf 100644 --- a/store/localcachelayer/team_layer.go +++ b/store/localcachelayer/team_layer.go @@ -4,8 +4,8 @@ package localcachelayer import ( - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type LocalCacheTeamStore struct { diff --git a/store/localcachelayer/team_layer_test.go b/store/localcachelayer/team_layer_test.go index 262037c55b..e4bcc499ba 100644 --- a/store/localcachelayer/team_layer_test.go +++ b/store/localcachelayer/team_layer_test.go @@ -9,8 +9,8 @@ import ( "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" + "github.com/mattermost/mattermost-server/v6/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) func TestTeamStore(t *testing.T) { diff --git a/store/localcachelayer/terms_of_service_layer.go b/store/localcachelayer/terms_of_service_layer.go index e688ab5b77..6a87d50bc9 100644 --- a/store/localcachelayer/terms_of_service_layer.go +++ b/store/localcachelayer/terms_of_service_layer.go @@ -4,8 +4,8 @@ package localcachelayer import ( - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) const ( diff --git a/store/localcachelayer/terms_of_service_layer_test.go b/store/localcachelayer/terms_of_service_layer_test.go index 7cec2f7dff..802c8fb4f1 100644 --- a/store/localcachelayer/terms_of_service_layer_test.go +++ b/store/localcachelayer/terms_of_service_layer_test.go @@ -9,9 +9,9 @@ import ( "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" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) func TestTermsOfServiceStore(t *testing.T) { diff --git a/store/localcachelayer/user_layer.go b/store/localcachelayer/user_layer.go index 1979f8ad18..e9cef4a0da 100644 --- a/store/localcachelayer/user_layer.go +++ b/store/localcachelayer/user_layer.go @@ -8,9 +8,9 @@ import ( "sort" "sync" - "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/store/sqlstore" ) type LocalCacheUserStore struct { diff --git a/store/localcachelayer/user_layer_test.go b/store/localcachelayer/user_layer_test.go index 949741f6db..ca9d159325 100644 --- a/store/localcachelayer/user_layer_test.go +++ b/store/localcachelayer/user_layer_test.go @@ -10,11 +10,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "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" - "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) func TestUserStore(t *testing.T) { diff --git a/store/localcachelayer/webhook_layer.go b/store/localcachelayer/webhook_layer.go index 4c895c54af..158e3922f5 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/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type LocalCacheWebhookStore struct { diff --git a/store/localcachelayer/webhook_layer_test.go b/store/localcachelayer/webhook_layer_test.go index ad5ae142d3..21c0a0dea6 100644 --- a/store/localcachelayer/webhook_layer_test.go +++ b/store/localcachelayer/webhook_layer_test.go @@ -9,9 +9,9 @@ import ( "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" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) func TestWebhookStore(t *testing.T) { diff --git a/store/opentracinglayer/opentracinglayer.go b/store/opentracinglayer/opentracinglayer.go index b287efdf62..c801a5ad71 100644 --- a/store/opentracinglayer/opentracinglayer.go +++ b/store/opentracinglayer/opentracinglayer.go @@ -9,9 +9,9 @@ package opentracinglayer import ( "context" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/tracing" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/tracing" + "github.com/mattermost/mattermost-server/v6/store" "github.com/opentracing/opentracing-go/ext" spanlog "github.com/opentracing/opentracing-go/log" ) diff --git a/store/retrylayer/retrylayer.go b/store/retrylayer/retrylayer.go index f50e525f66..f708b9014a 100644 --- a/store/retrylayer/retrylayer.go +++ b/store/retrylayer/retrylayer.go @@ -11,8 +11,8 @@ import ( "github.com/go-sql-driver/mysql" "github.com/lib/pq" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" "github.com/pkg/errors" ) diff --git a/store/retrylayer/retrylayer_test.go b/store/retrylayer/retrylayer_test.go index eeaca93187..0d2f95bad5 100644 --- a/store/retrylayer/retrylayer_test.go +++ b/store/retrylayer/retrylayer_test.go @@ -10,8 +10,8 @@ import ( "github.com/lib/pq" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) func genStore() *mocks.Store { diff --git a/store/searchlayer/channel_layer.go b/store/searchlayer/channel_layer.go index 2650072c7c..4277a13b29 100644 --- a/store/searchlayer/channel_layer.go +++ b/store/searchlayer/channel_layer.go @@ -8,10 +8,10 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/searchengine" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/searchengine" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) type SearchChannelStore struct { diff --git a/store/searchlayer/file_info_layer.go b/store/searchlayer/file_info_layer.go index 9b758174ea..131e702759 100644 --- a/store/searchlayer/file_info_layer.go +++ b/store/searchlayer/file_info_layer.go @@ -4,10 +4,10 @@ package searchlayer import ( - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/searchengine" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/searchengine" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) type SearchFileInfoStore struct { diff --git a/store/searchlayer/layer.go b/store/searchlayer/layer.go index dc6fd9f0a4..8b65fe4e12 100644 --- a/store/searchlayer/layer.go +++ b/store/searchlayer/layer.go @@ -7,10 +7,10 @@ import ( "context" "sync/atomic" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/searchengine" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/searchengine" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) type SearchStore struct { diff --git a/store/searchlayer/layer_test.go b/store/searchlayer/layer_test.go index e6e6d54445..70878e4d21 100644 --- a/store/searchlayer/layer_test.go +++ b/store/searchlayer/layer_test.go @@ -8,12 +8,12 @@ import ( "sync" "testing" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/searchengine" - "github.com/mattermost/mattermost-server/v5/store/searchlayer" - "github.com/mattermost/mattermost-server/v5/store/sqlstore" - "github.com/mattermost/mattermost-server/v5/store/storetest" - "github.com/mattermost/mattermost-server/v5/testlib" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/searchengine" + "github.com/mattermost/mattermost-server/v6/store/searchlayer" + "github.com/mattermost/mattermost-server/v6/store/sqlstore" + "github.com/mattermost/mattermost-server/v6/store/storetest" + "github.com/mattermost/mattermost-server/v6/testlib" ) // Test to verify race condition on UpdateConfig. The test must run with -race flag in order to verify diff --git a/store/searchlayer/post_layer.go b/store/searchlayer/post_layer.go index efeb39ae74..610652d75a 100644 --- a/store/searchlayer/post_layer.go +++ b/store/searchlayer/post_layer.go @@ -8,10 +8,10 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/searchengine" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/searchengine" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) type SearchPostStore struct { diff --git a/store/searchlayer/team_layer.go b/store/searchlayer/team_layer.go index ab192d948e..a8d16972c1 100644 --- a/store/searchlayer/team_layer.go +++ b/store/searchlayer/team_layer.go @@ -4,8 +4,8 @@ package searchlayer import ( - model "github.com/mattermost/mattermost-server/v5/model" - store "github.com/mattermost/mattermost-server/v5/store" + model "github.com/mattermost/mattermost-server/v6/model" + store "github.com/mattermost/mattermost-server/v6/store" ) type SearchTeamStore struct { diff --git a/store/searchlayer/user_layer.go b/store/searchlayer/user_layer.go index d98e124b47..4c5a820b25 100644 --- a/store/searchlayer/user_layer.go +++ b/store/searchlayer/user_layer.go @@ -9,10 +9,10 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/searchengine" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/searchengine" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) type SearchUserStore struct { diff --git a/store/searchtest/channel_layer.go b/store/searchtest/channel_layer.go index 631bd89f65..290bd9bc69 100644 --- a/store/searchtest/channel_layer.go +++ b/store/searchtest/channel_layer.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) var searchChannelStoreTests = []searchTest{ diff --git a/store/searchtest/file_info_layer.go b/store/searchtest/file_info_layer.go index f96d481487..a89d191640 100644 --- a/store/searchtest/file_info_layer.go +++ b/store/searchtest/file_info_layer.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) var searchFileInfoStoreTests = []searchTest{ diff --git a/store/searchtest/helper.go b/store/searchtest/helper.go index a608d7f510..23be7ae35c 100644 --- a/store/searchtest/helper.go +++ b/store/searchtest/helper.go @@ -11,8 +11,8 @@ import ( "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type SearchTestHelper struct { diff --git a/store/searchtest/post_layer.go b/store/searchtest/post_layer.go index baab1e1e33..7af5b90930 100644 --- a/store/searchtest/post_layer.go +++ b/store/searchtest/post_layer.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) var searchPostStoreTests = []searchTest{ diff --git a/store/searchtest/testlib.go b/store/searchtest/testlib.go index 487d8d224d..1dce7d8169 100644 --- a/store/searchtest/testlib.go +++ b/store/searchtest/testlib.go @@ -6,8 +6,8 @@ package searchtest import ( "testing" - "github.com/mattermost/mattermost-server/v5/store" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/utils" ) const ( diff --git a/store/searchtest/user_layer.go b/store/searchtest/user_layer.go index 2d9638764e..6660c56a4c 100644 --- a/store/searchtest/user_layer.go +++ b/store/searchtest/user_layer.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) var searchUserStoreTests = []searchTest{ diff --git a/store/sqlstore/audit_store.go b/store/sqlstore/audit_store.go index 12278ac44a..265749491e 100644 --- a/store/sqlstore/audit_store.go +++ b/store/sqlstore/audit_store.go @@ -7,8 +7,8 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type SqlAuditStore struct { diff --git a/store/sqlstore/audit_store_test.go b/store/sqlstore/audit_store_test.go index b510054a6f..ef70cb0d2e 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/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestAuditStore(t *testing.T) { diff --git a/store/sqlstore/bot_store.go b/store/sqlstore/bot_store.go index 79d7be06ab..169a8ad9a1 100644 --- a/store/sqlstore/bot_store.go +++ b/store/sqlstore/bot_store.go @@ -10,9 +10,9 @@ import ( "github.com/pkg/errors" - "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/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/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 b7f2464553..ea23ab6dbf 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/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/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 49c8431dee..34c8d913b5 100644 --- a/store/sqlstore/channel_member_history_store.go +++ b/store/sqlstore/channel_member_history_store.go @@ -10,9 +10,9 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/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 20a40e3c7f..47caac3235 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/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestChannelMemberHistoryStore(t *testing.T) { diff --git a/store/sqlstore/channel_store.go b/store/sqlstore/channel_store.go index 577a47bb1e..c3f799d7a8 100644 --- a/store/sqlstore/channel_store.go +++ b/store/sqlstore/channel_store.go @@ -16,11 +16,11 @@ import ( "github.com/mattermost/gorp" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/einterfaces" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/cache" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/cache" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) const ( diff --git a/store/sqlstore/channel_store_categories.go b/store/sqlstore/channel_store_categories.go index 122c9b9c97..1c6496b5ed 100644 --- a/store/sqlstore/channel_store_categories.go +++ b/store/sqlstore/channel_store_categories.go @@ -10,8 +10,8 @@ import ( "github.com/mattermost/gorp" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) // dbSelecter is an interface used to enable some internal store methods to diff --git a/store/sqlstore/channel_store_categories_test.go b/store/sqlstore/channel_store_categories_test.go index 51bfb7a78f..23c7cebea9 100644 --- a/store/sqlstore/channel_store_categories_test.go +++ b/store/sqlstore/channel_store_categories_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestChannelStoreCategories(t *testing.T) { diff --git a/store/sqlstore/channel_store_test.go b/store/sqlstore/channel_store_test.go index 06ed53599f..ee69b0f662 100644 --- a/store/sqlstore/channel_store_test.go +++ b/store/sqlstore/channel_store_test.go @@ -10,10 +10,10 @@ import ( "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/searchtest" - "github.com/mattermost/mattermost-server/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/store/searchtest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestChannelStore(t *testing.T) { diff --git a/store/sqlstore/cluster_discovery_store.go b/store/sqlstore/cluster_discovery_store.go index 23b86c1b97..c8840c5577 100644 --- a/store/sqlstore/cluster_discovery_store.go +++ b/store/sqlstore/cluster_discovery_store.go @@ -7,8 +7,8 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type sqlClusterDiscoveryStore struct { diff --git a/store/sqlstore/cluster_discovery_store_test.go b/store/sqlstore/cluster_discovery_store_test.go index 342f3509d1..14644a53a5 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/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestClusterDiscoveryStore(t *testing.T) { diff --git a/store/sqlstore/command_store.go b/store/sqlstore/command_store.go index c9c69a8937..6ef4ee1b49 100644 --- a/store/sqlstore/command_store.go +++ b/store/sqlstore/command_store.go @@ -9,8 +9,8 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type SqlCommandStore struct { diff --git a/store/sqlstore/command_store_test.go b/store/sqlstore/command_store_test.go index 7490d28b62..a142eb2d58 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/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestCommandStore(t *testing.T) { diff --git a/store/sqlstore/command_webhook_store.go b/store/sqlstore/command_webhook_store.go index e1eac526ec..6e78f54275 100644 --- a/store/sqlstore/command_webhook_store.go +++ b/store/sqlstore/command_webhook_store.go @@ -9,9 +9,9 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) type SqlCommandWebhookStore struct { diff --git a/store/sqlstore/command_webhook_store_test.go b/store/sqlstore/command_webhook_store_test.go index 46db27bb9c..245b8d44fe 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/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestCommandWebhookStore(t *testing.T) { diff --git a/store/sqlstore/compliance_store.go b/store/sqlstore/compliance_store.go index b9548b5d28..651d696446 100644 --- a/store/sqlstore/compliance_store.go +++ b/store/sqlstore/compliance_store.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type SqlComplianceStore struct { diff --git a/store/sqlstore/compliance_store_test.go b/store/sqlstore/compliance_store_test.go index 687c854453..4a428ace2a 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/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestComplianceStore(t *testing.T) { diff --git a/store/sqlstore/emoji_store.go b/store/sqlstore/emoji_store.go index 7f47aa1acc..adebcf7e2e 100644 --- a/store/sqlstore/emoji_store.go +++ b/store/sqlstore/emoji_store.go @@ -10,9 +10,9 @@ import ( "github.com/pkg/errors" - "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/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type SqlEmojiStore struct { diff --git a/store/sqlstore/emoji_store_test.go b/store/sqlstore/emoji_store_test.go index c5bc1b6c61..9bdd0f88c1 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/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestEmojiStore(t *testing.T) { diff --git a/store/sqlstore/file_info_store.go b/store/sqlstore/file_info_store.go index 9bc856abb2..e5f7cf8eda 100644 --- a/store/sqlstore/file_info_store.go +++ b/store/sqlstore/file_info_store.go @@ -13,10 +13,10 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/einterfaces" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) type SqlFileInfoStore struct { diff --git a/store/sqlstore/file_info_store_test.go b/store/sqlstore/file_info_store_test.go index 549d15138b..5b6e46e2aa 100644 --- a/store/sqlstore/file_info_store_test.go +++ b/store/sqlstore/file_info_store_test.go @@ -6,8 +6,8 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v5/store/searchtest" - "github.com/mattermost/mattermost-server/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/searchtest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestFileInfoStore(t *testing.T) { diff --git a/store/sqlstore/group_store.go b/store/sqlstore/group_store.go index 4621d60737..860e52cd3f 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/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type selectType int diff --git a/store/sqlstore/group_store_test.go b/store/sqlstore/group_store_test.go index 1ee0417102..aaa79f2d77 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/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestGroupStore(t *testing.T) { diff --git a/store/sqlstore/integrity.go b/store/sqlstore/integrity.go index a9de499f1e..04bdffebb3 100644 --- a/store/sqlstore/integrity.go +++ b/store/sqlstore/integrity.go @@ -6,8 +6,8 @@ package sqlstore import ( sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) type relationalCheckConfig struct { diff --git a/store/sqlstore/integrity_test.go b/store/sqlstore/integrity_test.go index 96c8fc9c76..717d520a53 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/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/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 c64a786919..b55e9caf05 100644 --- a/store/sqlstore/job_store.go +++ b/store/sqlstore/job_store.go @@ -12,8 +12,8 @@ import ( "github.com/mattermost/gorp" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type SqlJobStore struct { diff --git a/store/sqlstore/job_store_test.go b/store/sqlstore/job_store_test.go index ca7ed249c4..060c10c77e 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/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestJobStore(t *testing.T) { diff --git a/store/sqlstore/license_store.go b/store/sqlstore/license_store.go index 22ca5e117d..d86f07266f 100644 --- a/store/sqlstore/license_store.go +++ b/store/sqlstore/license_store.go @@ -7,8 +7,8 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) // SqlLicenseStore encapsulates the database writes and reads for diff --git a/store/sqlstore/license_store_test.go b/store/sqlstore/license_store_test.go index 82ef57d60a..80f84e06fe 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/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestLicenseStore(t *testing.T) { diff --git a/store/sqlstore/link_metadata_store.go b/store/sqlstore/link_metadata_store.go index 5e8f2ffcfb..46e57090e2 100644 --- a/store/sqlstore/link_metadata_store.go +++ b/store/sqlstore/link_metadata_store.go @@ -9,8 +9,8 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type SqlLinkMetadataStore struct { diff --git a/store/sqlstore/link_metadata_store_test.go b/store/sqlstore/link_metadata_store_test.go index 76071210c0..315887eb85 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/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestLinkMetadataStore(t *testing.T) { diff --git a/store/sqlstore/main_test.go b/store/sqlstore/main_test.go index 7ff1f15735..a47adda458 100644 --- a/store/sqlstore/main_test.go +++ b/store/sqlstore/main_test.go @@ -6,9 +6,9 @@ package sqlstore_test import ( "testing" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store/sqlstore" - "github.com/mattermost/mattermost-server/v5/testlib" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store/sqlstore" + "github.com/mattermost/mattermost-server/v6/testlib" ) var mainHelper *testlib.MainHelper diff --git a/store/sqlstore/oauth_store.go b/store/sqlstore/oauth_store.go index e5858520ee..a489236440 100644 --- a/store/sqlstore/oauth_store.go +++ b/store/sqlstore/oauth_store.go @@ -10,8 +10,8 @@ import ( "github.com/mattermost/gorp" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type SqlOAuthStore struct { diff --git a/store/sqlstore/oauth_store_test.go b/store/sqlstore/oauth_store_test.go index cc9290eab6..9c7d5ea984 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/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestOAuthStore(t *testing.T) { diff --git a/store/sqlstore/plugin_store.go b/store/sqlstore/plugin_store.go index 660e94b546..cffcc26151 100644 --- a/store/sqlstore/plugin_store.go +++ b/store/sqlstore/plugin_store.go @@ -11,8 +11,8 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) const ( diff --git a/store/sqlstore/plugin_store_test.go b/store/sqlstore/plugin_store_test.go index d71931822f..c1583b7696 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/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestPluginStore(t *testing.T) { diff --git a/store/sqlstore/post_store.go b/store/sqlstore/post_store.go index ab9cdded4c..8be7397c58 100644 --- a/store/sqlstore/post_store.go +++ b/store/sqlstore/post_store.go @@ -18,12 +18,12 @@ import ( "github.com/mattermost/gorp" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/einterfaces" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" - "github.com/mattermost/mattermost-server/v5/store/searchlayer" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/store/searchlayer" + "github.com/mattermost/mattermost-server/v6/utils" ) type SqlPostStore struct { diff --git a/store/sqlstore/post_store_test.go b/store/sqlstore/post_store_test.go index 73dca3b96d..d7a1cc86cb 100644 --- a/store/sqlstore/post_store_test.go +++ b/store/sqlstore/post_store_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/store/searchtest" - "github.com/mattermost/mattermost-server/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/searchtest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestPostStore(t *testing.T) { diff --git a/store/sqlstore/preference_store.go b/store/sqlstore/preference_store.go index ebb93793fb..5ccd0591d2 100644 --- a/store/sqlstore/preference_store.go +++ b/store/sqlstore/preference_store.go @@ -6,9 +6,9 @@ package sqlstore import ( sq "github.com/Masterminds/squirrel" "github.com/mattermost/gorp" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" "github.com/pkg/errors" ) diff --git a/store/sqlstore/preference_store_test.go b/store/sqlstore/preference_store_test.go index 5d29aa6874..8241853fae 100644 --- a/store/sqlstore/preference_store_test.go +++ b/store/sqlstore/preference_store_test.go @@ -8,9 +8,9 @@ import ( "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestPreferenceStore(t *testing.T) { diff --git a/store/sqlstore/product_notices_store.go b/store/sqlstore/product_notices_store.go index 26983399dd..a9b9e3b7c0 100644 --- a/store/sqlstore/product_notices_store.go +++ b/store/sqlstore/product_notices_store.go @@ -9,8 +9,8 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type SqlProductNoticesStore struct { diff --git a/store/sqlstore/product_notices_store_test.go b/store/sqlstore/product_notices_store_test.go index cb29e1f3fd..d780bbf5b3 100644 --- a/store/sqlstore/product_notices_store_test.go +++ b/store/sqlstore/product_notices_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestProductNoticesStore(t *testing.T) { diff --git a/store/sqlstore/reaction_store.go b/store/sqlstore/reaction_store.go index 63d92c6d65..de6e5b1879 100644 --- a/store/sqlstore/reaction_store.go +++ b/store/sqlstore/reaction_store.go @@ -6,9 +6,9 @@ package sqlstore import ( sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" "github.com/mattermost/gorp" "github.com/pkg/errors" diff --git a/store/sqlstore/reaction_store_test.go b/store/sqlstore/reaction_store_test.go index c793095334..579592da08 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/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestReactionStore(t *testing.T) { diff --git a/store/sqlstore/remote_cluster_store.go b/store/sqlstore/remote_cluster_store.go index 9defad0b95..041a786e70 100644 --- a/store/sqlstore/remote_cluster_store.go +++ b/store/sqlstore/remote_cluster_store.go @@ -10,8 +10,8 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type sqlRemoteClusterStore struct { diff --git a/store/sqlstore/remote_cluster_store_test.go b/store/sqlstore/remote_cluster_store_test.go index a6330b74a8..b55e0bed3c 100644 --- a/store/sqlstore/remote_cluster_store_test.go +++ b/store/sqlstore/remote_cluster_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestRemoteClusterStore(t *testing.T) { diff --git a/store/sqlstore/retention_policy_store.go b/store/sqlstore/retention_policy_store.go index 0bca67ac97..8136be3009 100644 --- a/store/sqlstore/retention_policy_store.go +++ b/store/sqlstore/retention_policy_store.go @@ -12,9 +12,9 @@ import ( "github.com/go-sql-driver/mysql" "github.com/lib/pq" "github.com/mattermost/gorp" - "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/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" "github.com/pkg/errors" ) diff --git a/store/sqlstore/retention_policy_store_test.go b/store/sqlstore/retention_policy_store_test.go index c11cb89ca5..acafa5751a 100644 --- a/store/sqlstore/retention_policy_store_test.go +++ b/store/sqlstore/retention_policy_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestRetentionPolicyStore(t *testing.T) { diff --git a/store/sqlstore/role_store.go b/store/sqlstore/role_store.go index 8070bb821b..5e8d120ef8 100644 --- a/store/sqlstore/role_store.go +++ b/store/sqlstore/role_store.go @@ -13,8 +13,8 @@ import ( "github.com/mattermost/gorp" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type SqlRoleStore struct { diff --git a/store/sqlstore/role_store_test.go b/store/sqlstore/role_store_test.go index 870c9ce67d..94ec019625 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/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestRoleStore(t *testing.T) { diff --git a/store/sqlstore/scheme_store.go b/store/sqlstore/scheme_store.go index 01ba87c4ea..07f7c9773a 100644 --- a/store/sqlstore/scheme_store.go +++ b/store/sqlstore/scheme_store.go @@ -11,8 +11,8 @@ import ( "github.com/mattermost/gorp" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type SqlSchemeStore struct { diff --git a/store/sqlstore/scheme_store_test.go b/store/sqlstore/scheme_store_test.go index fbd7ce43b7..50562227a6 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/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestSchemeStore(t *testing.T) { diff --git a/store/sqlstore/session_store.go b/store/sqlstore/session_store.go index 93c4b72395..dacec0c83e 100644 --- a/store/sqlstore/session_store.go +++ b/store/sqlstore/session_store.go @@ -11,9 +11,9 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) const ( diff --git a/store/sqlstore/session_store_test.go b/store/sqlstore/session_store_test.go index 79c389937d..c67e167075 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/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestSessionStore(t *testing.T) { diff --git a/store/sqlstore/shared_channel_store.go b/store/sqlstore/shared_channel_store.go index 9c71318861..7fcae61809 100644 --- a/store/sqlstore/shared_channel_store.go +++ b/store/sqlstore/shared_channel_store.go @@ -7,8 +7,8 @@ import ( "database/sql" "fmt" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" sq "github.com/Masterminds/squirrel" "github.com/pkg/errors" diff --git a/store/sqlstore/shared_channel_store_test.go b/store/sqlstore/shared_channel_store_test.go index 3f67e05b92..62be683c18 100644 --- a/store/sqlstore/shared_channel_store_test.go +++ b/store/sqlstore/shared_channel_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestSharedChannelStore(t *testing.T) { diff --git a/store/sqlstore/status_store.go b/store/sqlstore/status_store.go index 09e05a46e6..7896eb3a80 100644 --- a/store/sqlstore/status_store.go +++ b/store/sqlstore/status_store.go @@ -13,8 +13,8 @@ import ( "github.com/pkg/errors" "github.com/mattermost/gorp" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type SqlStatusStore struct { diff --git a/store/sqlstore/status_store_test.go b/store/sqlstore/status_store_test.go index da96808bdf..ec79e80ca1 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/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestStatusStore(t *testing.T) { diff --git a/store/sqlstore/store.go b/store/sqlstore/store.go index 55b9b23a86..9516058055 100644 --- a/store/sqlstore/store.go +++ b/store/sqlstore/store.go @@ -30,12 +30,12 @@ import ( "github.com/mattermost/gorp" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/db/migrations" - "github.com/mattermost/mattermost-server/v5/einterfaces" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/db/migrations" + "github.com/mattermost/mattermost-server/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) type migrationDirection string @@ -139,7 +139,7 @@ type SqlStoreStores struct { type SqlStore struct { // rrCounter and srCounter should be kept first. - // See https://github.com/mattermost/mattermost-server/v5/pull/7281 + // See https://github.com/mattermost/mattermost-server/v6/pull/7281 rrCounter int64 srCounter int64 master *gorp.DbMap diff --git a/store/sqlstore/store_test.go b/store/sqlstore/store_test.go index 752f46fc76..aa52635ae8 100644 --- a/store/sqlstore/store_test.go +++ b/store/sqlstore/store_test.go @@ -18,11 +18,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/einterfaces/mocks" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" - "github.com/mattermost/mattermost-server/v5/store/searchtest" - "github.com/mattermost/mattermost-server/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/einterfaces/mocks" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/store/searchtest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) type storeType struct { diff --git a/store/sqlstore/system_store.go b/store/sqlstore/system_store.go index aab3d48ecf..d581c8b376 100644 --- a/store/sqlstore/system_store.go +++ b/store/sqlstore/system_store.go @@ -13,9 +13,9 @@ import ( "github.com/pkg/errors" - "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/utils" ) type SqlSystemStore struct { diff --git a/store/sqlstore/system_store_test.go b/store/sqlstore/system_store_test.go index dfd8381bd4..e4ae33e29d 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/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestSystemStore(t *testing.T) { diff --git a/store/sqlstore/team_store.go b/store/sqlstore/team_store.go index 115fb40f4b..e11db8a575 100644 --- a/store/sqlstore/team_store.go +++ b/store/sqlstore/team_store.go @@ -13,9 +13,9 @@ import ( "github.com/mattermost/gorp" "github.com/pkg/errors" - "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/utils" ) const ( diff --git a/store/sqlstore/team_store_test.go b/store/sqlstore/team_store_test.go index 548f1d5879..833a67f4d7 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/v5/model" - "github.com/mattermost/mattermost-server/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/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 67628414a4..f3c5c792db 100644 --- a/store/sqlstore/terms_of_service_store.go +++ b/store/sqlstore/terms_of_service_store.go @@ -8,9 +8,9 @@ import ( "github.com/pkg/errors" - "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/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type SqlTermsOfServiceStore struct { diff --git a/store/sqlstore/terms_of_service_store_test.go b/store/sqlstore/terms_of_service_store_test.go index 45d919b574..6aedab1bda 100644 --- a/store/sqlstore/terms_of_service_store_test.go +++ b/store/sqlstore/terms_of_service_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestTermsOfServiceStore(t *testing.T) { diff --git a/store/sqlstore/thread_store.go b/store/sqlstore/thread_store.go index 7a291afc5a..ba404a30c5 100644 --- a/store/sqlstore/thread_store.go +++ b/store/sqlstore/thread_store.go @@ -12,9 +12,9 @@ import ( "github.com/mattermost/gorp" "github.com/pkg/errors" - "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/utils" ) type SqlThreadStore struct { diff --git a/store/sqlstore/thread_store_test.go b/store/sqlstore/thread_store_test.go index e65f53a6a1..c3db8a29de 100644 --- a/store/sqlstore/thread_store_test.go +++ b/store/sqlstore/thread_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestThreadStore(t *testing.T) { diff --git a/store/sqlstore/tokens_store.go b/store/sqlstore/tokens_store.go index b258bb3c2a..dd876be5f5 100644 --- a/store/sqlstore/tokens_store.go +++ b/store/sqlstore/tokens_store.go @@ -10,9 +10,9 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" ) type SqlTokenStore struct { diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go index ad303b7990..f40f8110f4 100644 --- a/store/sqlstore/upgrade.go +++ b/store/sqlstore/upgrade.go @@ -13,9 +13,9 @@ import ( "github.com/blang/semver" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/timezones" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/timezones" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) const ( diff --git a/store/sqlstore/upgrade_test.go b/store/sqlstore/upgrade_test.go index 9284e7468a..9aac39fc83 100644 --- a/store/sqlstore/upgrade_test.go +++ b/store/sqlstore/upgrade_test.go @@ -10,8 +10,8 @@ import ( "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func TestStoreUpgradeDotRelease(t *testing.T) { diff --git a/store/sqlstore/upload_session_store.go b/store/sqlstore/upload_session_store.go index 980de2abbd..c29082a963 100644 --- a/store/sqlstore/upload_session_store.go +++ b/store/sqlstore/upload_session_store.go @@ -9,8 +9,8 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type SqlUploadSessionStore struct { diff --git a/store/sqlstore/upload_session_store_test.go b/store/sqlstore/upload_session_store_test.go index 1f85507f74..87a7012a24 100644 --- a/store/sqlstore/upload_session_store_test.go +++ b/store/sqlstore/upload_session_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestUploadSessionStore(t *testing.T) { diff --git a/store/sqlstore/user_access_token_store.go b/store/sqlstore/user_access_token_store.go index d43bf0b542..497cf74adc 100644 --- a/store/sqlstore/user_access_token_store.go +++ b/store/sqlstore/user_access_token_store.go @@ -10,8 +10,8 @@ import ( "github.com/mattermost/gorp" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/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 dacd767317..93e91e9ccf 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/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestUserAccessTokenStore(t *testing.T) { diff --git a/store/sqlstore/user_store.go b/store/sqlstore/user_store.go index a93b48f04d..61ca9c3218 100644 --- a/store/sqlstore/user_store.go +++ b/store/sqlstore/user_store.go @@ -16,9 +16,9 @@ import ( "github.com/pkg/errors" "golang.org/x/sync/errgroup" - "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/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) const ( diff --git a/store/sqlstore/user_store_test.go b/store/sqlstore/user_store_test.go index 6c720c7940..590184e3d9 100644 --- a/store/sqlstore/user_store_test.go +++ b/store/sqlstore/user_store_test.go @@ -6,8 +6,8 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v5/store/searchtest" - "github.com/mattermost/mattermost-server/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/searchtest" + "github.com/mattermost/mattermost-server/v6/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 120319be0c..9f3d1d2f85 100644 --- a/store/sqlstore/user_terms_of_service.go +++ b/store/sqlstore/user_terms_of_service.go @@ -8,8 +8,8 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/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 d938d59751..476163f525 100644 --- a/store/sqlstore/user_terms_of_service_store_test.go +++ b/store/sqlstore/user_terms_of_service_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestUserTermsOfServiceStore(t *testing.T) { diff --git a/store/sqlstore/utils.go b/store/sqlstore/utils.go index 1716cdd8a5..fa95170a8d 100644 --- a/store/sqlstore/utils.go +++ b/store/sqlstore/utils.go @@ -11,7 +11,7 @@ import ( "github.com/mattermost/gorp" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) var escapeLikeSearchChar = []string{ diff --git a/store/sqlstore/webhook_store.go b/store/sqlstore/webhook_store.go index beca775fb2..faed36ce41 100644 --- a/store/sqlstore/webhook_store.go +++ b/store/sqlstore/webhook_store.go @@ -9,9 +9,9 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/pkg/errors" - "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/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type SqlWebhookStore struct { diff --git a/store/sqlstore/webhook_store_test.go b/store/sqlstore/webhook_store_test.go index 88a1c11758..85da6a3e1d 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/v5/store/storetest" + "github.com/mattermost/mattermost-server/v6/store/storetest" ) func TestWebhookStore(t *testing.T) { diff --git a/store/store.go b/store/store.go index a84ec086f6..03c9a6e8c9 100644 --- a/store/store.go +++ b/store/store.go @@ -9,7 +9,7 @@ import ( "context" "time" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type StoreResult struct { diff --git a/store/storetest/audit_store.go b/store/storetest/audit_store.go index 7087636df9..c45e979619 100644 --- a/store/storetest/audit_store.go +++ b/store/storetest/audit_store.go @@ -10,8 +10,8 @@ import ( "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func TestAuditStore(t *testing.T, ss store.Store) { diff --git a/store/storetest/bot_store.go b/store/storetest/bot_store.go index 3ef4cc12f6..4ab20bfa29 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/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/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 9d918c88d3..7c701e336a 100644 --- a/store/storetest/channel_member_history_store.go +++ b/store/storetest/channel_member_history_store.go @@ -11,8 +11,8 @@ import ( "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func TestChannelMemberHistoryStore(t *testing.T, ss store.Store) { diff --git a/store/storetest/channel_store.go b/store/storetest/channel_store.go index 1be65246f1..097c864c2d 100644 --- a/store/storetest/channel_store.go +++ b/store/storetest/channel_store.go @@ -16,10 +16,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/timezones" - "github.com/mattermost/mattermost-server/v5/store" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/timezones" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/utils" ) type SqlStore interface { diff --git a/store/storetest/channel_store_categories.go b/store/storetest/channel_store_categories.go index 0603b6498c..a7874febb1 100644 --- a/store/storetest/channel_store_categories.go +++ b/store/storetest/channel_store_categories.go @@ -12,8 +12,8 @@ import ( "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func TestChannelStoreCategories(t *testing.T, ss store.Store, s SqlStore) { diff --git a/store/storetest/cluster_discovery_store.go b/store/storetest/cluster_discovery_store.go index 300e96b53f..ced4e095c6 100644 --- a/store/storetest/cluster_discovery_store.go +++ b/store/storetest/cluster_discovery_store.go @@ -10,8 +10,8 @@ import ( "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func TestClusterDiscoveryStore(t *testing.T, ss store.Store) { diff --git a/store/storetest/command_store.go b/store/storetest/command_store.go index 692980776c..089a069aaa 100644 --- a/store/storetest/command_store.go +++ b/store/storetest/command_store.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/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 3531bc9ab0..fff2f1fa7b 100644 --- a/store/storetest/command_webhook_store.go +++ b/store/storetest/command_webhook_store.go @@ -10,8 +10,8 @@ import ( "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func TestCommandWebhookStore(t *testing.T, ss store.Store) { diff --git a/store/storetest/compliance_store.go b/store/storetest/compliance_store.go index 43543ed1b6..6346b5b995 100644 --- a/store/storetest/compliance_store.go +++ b/store/storetest/compliance_store.go @@ -11,8 +11,8 @@ import ( "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func cleanupStoreState(t *testing.T, ss store.Store) { diff --git a/store/storetest/emoji_store.go b/store/storetest/emoji_store.go index aca1fa7eb9..357809a5aa 100644 --- a/store/storetest/emoji_store.go +++ b/store/storetest/emoji_store.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/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 2f48b3212c..4e8801ef9a 100644 --- a/store/storetest/file_info_store.go +++ b/store/storetest/file_info_store.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/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 de8885f81a..f33ba82011 100644 --- a/store/storetest/group_store.go +++ b/store/storetest/group_store.go @@ -15,9 +15,9 @@ import ( "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/utils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/utils" ) func TestGroupStore(t *testing.T, ss store.Store) { diff --git a/store/storetest/job_store.go b/store/storetest/job_store.go index 0449afa3c0..c7ce43cd27 100644 --- a/store/storetest/job_store.go +++ b/store/storetest/job_store.go @@ -12,8 +12,8 @@ import ( "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func TestJobStore(t *testing.T, ss store.Store) { diff --git a/store/storetest/license_store.go b/store/storetest/license_store.go index 28a1528653..2ac5251d7f 100644 --- a/store/storetest/license_store.go +++ b/store/storetest/license_store.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func TestLicenseStore(t *testing.T, ss store.Store) { diff --git a/store/storetest/link_metadata_store.go b/store/storetest/link_metadata_store.go index 09f35e549f..feb56787c7 100644 --- a/store/storetest/link_metadata_store.go +++ b/store/storetest/link_metadata_store.go @@ -12,8 +12,8 @@ import ( "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) // These tests are ran on the same store instance, so this provides easier unique, valid timestamps diff --git a/store/storetest/mocks/AuditStore.go b/store/storetest/mocks/AuditStore.go index 03f9eb0a55..f83fe3de61 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/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/BotStore.go b/store/storetest/mocks/BotStore.go index 8126a2a742..26851420aa 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/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/ChannelMemberHistoryStore.go b/store/storetest/mocks/ChannelMemberHistoryStore.go index c274b470e5..6f0f9add56 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/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/ChannelStore.go b/store/storetest/mocks/ChannelStore.go index e446d7697a..3417f16396 100644 --- a/store/storetest/mocks/ChannelStore.go +++ b/store/storetest/mocks/ChannelStore.go @@ -7,10 +7,10 @@ package mocks import ( context "context" - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" - store "github.com/mattermost/mattermost-server/v5/store" + store "github.com/mattermost/mattermost-server/v6/store" ) // ChannelStore is an autogenerated mock type for the ChannelStore type diff --git a/store/storetest/mocks/ClusterDiscoveryStore.go b/store/storetest/mocks/ClusterDiscoveryStore.go index b241a63d20..b7bfeb54f9 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/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/CommandStore.go b/store/storetest/mocks/CommandStore.go index 48ff965488..f50d58a622 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/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/CommandWebhookStore.go b/store/storetest/mocks/CommandWebhookStore.go index f9dbb1bcbd..124ad4a052 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/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/ComplianceStore.go b/store/storetest/mocks/ComplianceStore.go index 0fa369fe07..cbde5b0971 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/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/EmojiStore.go b/store/storetest/mocks/EmojiStore.go index 75f0f02c26..c9eef90846 100644 --- a/store/storetest/mocks/EmojiStore.go +++ b/store/storetest/mocks/EmojiStore.go @@ -7,7 +7,7 @@ package mocks import ( context "context" - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/FileInfoStore.go b/store/storetest/mocks/FileInfoStore.go index c0a95731ef..1fabed0ea3 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/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/GroupStore.go b/store/storetest/mocks/GroupStore.go index a50b558c15..77a0d568ab 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/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/JobStore.go b/store/storetest/mocks/JobStore.go index b3bac22f8c..83c0f27c46 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/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/LicenseStore.go b/store/storetest/mocks/LicenseStore.go index 0bc01d907e..b58a28ee83 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/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/LinkMetadataStore.go b/store/storetest/mocks/LinkMetadataStore.go index 5b6cfedd0f..a3aa2bda98 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/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/OAuthStore.go b/store/storetest/mocks/OAuthStore.go index a1af8e1cfc..3afd270355 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/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/PluginStore.go b/store/storetest/mocks/PluginStore.go index 8641a88a58..b0a051ac60 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/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/PostStore.go b/store/storetest/mocks/PostStore.go index c384704d49..53962be6e1 100644 --- a/store/storetest/mocks/PostStore.go +++ b/store/storetest/mocks/PostStore.go @@ -7,7 +7,7 @@ package mocks import ( context "context" - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/PreferenceStore.go b/store/storetest/mocks/PreferenceStore.go index b1b3149fce..beae0ed791 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/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/ProductNoticesStore.go b/store/storetest/mocks/ProductNoticesStore.go index 2c2feddeb9..1cd3c61d81 100644 --- a/store/storetest/mocks/ProductNoticesStore.go +++ b/store/storetest/mocks/ProductNoticesStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/ReactionStore.go b/store/storetest/mocks/ReactionStore.go index d7e10e2bc8..c2cb5bcefd 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/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/RemoteClusterStore.go b/store/storetest/mocks/RemoteClusterStore.go index dfa1fc1c34..cf908f9c83 100644 --- a/store/storetest/mocks/RemoteClusterStore.go +++ b/store/storetest/mocks/RemoteClusterStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/RetentionPolicyStore.go b/store/storetest/mocks/RetentionPolicyStore.go index 3a15db11ab..efde61596d 100644 --- a/store/storetest/mocks/RetentionPolicyStore.go +++ b/store/storetest/mocks/RetentionPolicyStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/RoleStore.go b/store/storetest/mocks/RoleStore.go index 622cef22cc..d3e6184423 100644 --- a/store/storetest/mocks/RoleStore.go +++ b/store/storetest/mocks/RoleStore.go @@ -7,7 +7,7 @@ package mocks import ( context "context" - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/SchemeStore.go b/store/storetest/mocks/SchemeStore.go index 37e33dbe29..b29543561f 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/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/SessionStore.go b/store/storetest/mocks/SessionStore.go index 5577fbf719..083d9451cc 100644 --- a/store/storetest/mocks/SessionStore.go +++ b/store/storetest/mocks/SessionStore.go @@ -7,7 +7,7 @@ package mocks import ( context "context" - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/SharedChannelStore.go b/store/storetest/mocks/SharedChannelStore.go index 0973ac908e..e40dd74ccb 100644 --- a/store/storetest/mocks/SharedChannelStore.go +++ b/store/storetest/mocks/SharedChannelStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/StatusStore.go b/store/storetest/mocks/StatusStore.go index 483152ddc1..45dc913993 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/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/Store.go b/store/storetest/mocks/Store.go index 7dc2937831..508e698ec7 100644 --- a/store/storetest/mocks/Store.go +++ b/store/storetest/mocks/Store.go @@ -7,10 +7,10 @@ package mocks import ( context "context" - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" - store "github.com/mattermost/mattermost-server/v5/store" + store "github.com/mattermost/mattermost-server/v6/store" time "time" ) diff --git a/store/storetest/mocks/SystemStore.go b/store/storetest/mocks/SystemStore.go index 48dc2c51c5..c3f454264a 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/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/TeamStore.go b/store/storetest/mocks/TeamStore.go index a09d6c79ea..67933dbe80 100644 --- a/store/storetest/mocks/TeamStore.go +++ b/store/storetest/mocks/TeamStore.go @@ -7,7 +7,7 @@ package mocks import ( context "context" - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/TermsOfServiceStore.go b/store/storetest/mocks/TermsOfServiceStore.go index ffa02b5700..a9d9d78a7f 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/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/ThreadStore.go b/store/storetest/mocks/ThreadStore.go index 317540e280..bfe217e01f 100644 --- a/store/storetest/mocks/ThreadStore.go +++ b/store/storetest/mocks/ThreadStore.go @@ -5,8 +5,8 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v5/model" - store "github.com/mattermost/mattermost-server/v5/store" + model "github.com/mattermost/mattermost-server/v6/model" + store "github.com/mattermost/mattermost-server/v6/store" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/TokenStore.go b/store/storetest/mocks/TokenStore.go index 8bc2ce33ba..8221856304 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/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/UploadSessionStore.go b/store/storetest/mocks/UploadSessionStore.go index 7d3f8c8e3c..9067e34493 100644 --- a/store/storetest/mocks/UploadSessionStore.go +++ b/store/storetest/mocks/UploadSessionStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/UserAccessTokenStore.go b/store/storetest/mocks/UserAccessTokenStore.go index 287ae847e3..4cb4bbe21a 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/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/UserStore.go b/store/storetest/mocks/UserStore.go index 7155381b2a..adc7e38764 100644 --- a/store/storetest/mocks/UserStore.go +++ b/store/storetest/mocks/UserStore.go @@ -7,10 +7,10 @@ package mocks import ( context "context" - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" - store "github.com/mattermost/mattermost-server/v5/store" + store "github.com/mattermost/mattermost-server/v6/store" ) // UserStore is an autogenerated mock type for the UserStore type diff --git a/store/storetest/mocks/UserTermsOfServiceStore.go b/store/storetest/mocks/UserTermsOfServiceStore.go index a9aeb08149..099d0912a3 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/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/WebhookStore.go b/store/storetest/mocks/WebhookStore.go index dfaf5dff39..18e5efe4f4 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/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/oauth_store.go b/store/storetest/oauth_store.go index 2ea74d156d..294fe6db23 100644 --- a/store/storetest/oauth_store.go +++ b/store/storetest/oauth_store.go @@ -10,8 +10,8 @@ import ( "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func TestOAuthStore(t *testing.T, ss store.Store) { diff --git a/store/storetest/plugin_store.go b/store/storetest/plugin_store.go index 62732c23d0..0304764b56 100644 --- a/store/storetest/plugin_store.go +++ b/store/storetest/plugin_store.go @@ -10,8 +10,8 @@ import ( "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func TestPluginStore(t *testing.T, ss store.Store, s SqlStore) { diff --git a/store/storetest/post_store.go b/store/storetest/post_store.go index 6131421fcc..db3b7f6238 100644 --- a/store/storetest/post_store.go +++ b/store/storetest/post_store.go @@ -14,9 +14,9 @@ import ( "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/utils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/utils" ) func TestPostStore(t *testing.T, ss store.Store, s SqlStore) { diff --git a/store/storetest/preference_store.go b/store/storetest/preference_store.go index bb5054012e..15b8165ed3 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/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func TestPreferenceStore(t *testing.T, ss store.Store) { diff --git a/store/storetest/product_notices_store.go b/store/storetest/product_notices_store.go index 529adff995..b539aabc4f 100644 --- a/store/storetest/product_notices_store.go +++ b/store/storetest/product_notices_store.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func TestProductNoticesStore(t *testing.T, ss store.Store) { diff --git a/store/storetest/reaction_store.go b/store/storetest/reaction_store.go index 57870a118e..026267acab 100644 --- a/store/storetest/reaction_store.go +++ b/store/storetest/reaction_store.go @@ -13,9 +13,9 @@ import ( "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/retrylayer" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/store/retrylayer" ) func TestReactionStore(t *testing.T, ss store.Store, s SqlStore) { diff --git a/store/storetest/remote_cluster_store.go b/store/storetest/remote_cluster_store.go index 0ad7c5b1fd..e5fb49edce 100644 --- a/store/storetest/remote_cluster_store.go +++ b/store/storetest/remote_cluster_store.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/store/storetest/retention_policy_store.go b/store/storetest/retention_policy_store.go index 4970f3a24b..d3704fe618 100644 --- a/store/storetest/retention_policy_store.go +++ b/store/storetest/retention_policy_store.go @@ -8,8 +8,8 @@ import ( "strconv" "testing" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" "github.com/stretchr/testify/require" ) diff --git a/store/storetest/role_store.go b/store/storetest/role_store.go index fe076ac2b5..4213903c76 100644 --- a/store/storetest/role_store.go +++ b/store/storetest/role_store.go @@ -11,8 +11,8 @@ import ( "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func TestRoleStore(t *testing.T, ss store.Store, s SqlStore) { diff --git a/store/storetest/scheme_store.go b/store/storetest/scheme_store.go index 811e641ad1..31da95af33 100644 --- a/store/storetest/scheme_store.go +++ b/store/storetest/scheme_store.go @@ -10,8 +10,8 @@ import ( "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func TestSchemeStore(t *testing.T, ss store.Store) { diff --git a/store/storetest/session_store.go b/store/storetest/session_store.go index d5954a783f..bc15158fca 100644 --- a/store/storetest/session_store.go +++ b/store/storetest/session_store.go @@ -10,8 +10,8 @@ import ( "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) const ( diff --git a/store/storetest/settings.go b/store/storetest/settings.go index 77e70bfe63..989476832a 100644 --- a/store/storetest/settings.go +++ b/store/storetest/settings.go @@ -16,7 +16,7 @@ import ( _ "github.com/lib/pq" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) const ( diff --git a/store/storetest/shared_channel_store.go b/store/storetest/shared_channel_store.go index fa2c3f4c08..d8924c5bb0 100644 --- a/store/storetest/shared_channel_store.go +++ b/store/storetest/shared_channel_store.go @@ -11,8 +11,8 @@ import ( "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func TestSharedChannelStore(t *testing.T, ss store.Store, s SqlStore) { diff --git a/store/storetest/status_store.go b/store/storetest/status_store.go index 662b740920..0e30ddaec7 100644 --- a/store/storetest/status_store.go +++ b/store/storetest/status_store.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func TestStatusStore(t *testing.T, ss store.Store) { diff --git a/store/storetest/store.go b/store/storetest/store.go index 1f0c0a181f..d2217f5192 100644 --- a/store/storetest/store.go +++ b/store/storetest/store.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/mock" - "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/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 7f3d4ead7c..a0a2f9fdb0 100644 --- a/store/storetest/storetestlib.go +++ b/store/storetest/storetestlib.go @@ -4,7 +4,7 @@ package storetest import ( - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func MakeEmail() string { diff --git a/store/storetest/system_store.go b/store/storetest/system_store.go index dfcf5a696a..d5976e15f1 100644 --- a/store/storetest/system_store.go +++ b/store/storetest/system_store.go @@ -10,8 +10,8 @@ import ( "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func TestSystemStore(t *testing.T, ss store.Store) { diff --git a/store/storetest/team_store.go b/store/storetest/team_store.go index 2087868023..808a69d2ae 100644 --- a/store/storetest/team_store.go +++ b/store/storetest/team_store.go @@ -13,8 +13,8 @@ import ( "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/v6/model" + "github.com/mattermost/mattermost-server/v6/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 75908d06ca..9705efa774 100644 --- a/store/storetest/terms_of_service_store.go +++ b/store/storetest/terms_of_service_store.go @@ -9,8 +9,8 @@ import ( "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func TestTermsOfServiceStore(t *testing.T, ss store.Store) { diff --git a/store/storetest/thread_store.go b/store/storetest/thread_store.go index 4263936bdc..dd82d5a61b 100644 --- a/store/storetest/thread_store.go +++ b/store/storetest/thread_store.go @@ -11,8 +11,8 @@ import ( "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func TestThreadStore(t *testing.T, ss store.Store, s SqlStore) { diff --git a/store/storetest/upload_session_store.go b/store/storetest/upload_session_store.go index 6be39ac80f..5999ca59ca 100644 --- a/store/storetest/upload_session_store.go +++ b/store/storetest/upload_session_store.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func TestUploadSessionStore(t *testing.T, ss store.Store) { diff --git a/store/storetest/user_access_token_store.go b/store/storetest/user_access_token_store.go index 70bc6a30f7..fa1aa5481a 100644 --- a/store/storetest/user_access_token_store.go +++ b/store/storetest/user_access_token_store.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func TestUserAccessTokenStore(t *testing.T, ss store.Store) { diff --git a/store/storetest/user_store.go b/store/storetest/user_store.go index aec4a52bff..6c0f7b1b4b 100644 --- a/store/storetest/user_store.go +++ b/store/storetest/user_store.go @@ -13,8 +13,8 @@ import ( "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) const ( diff --git a/store/storetest/user_terms_of_service.go b/store/storetest/user_terms_of_service.go index 51083d3a6b..fe88d72d65 100644 --- a/store/storetest/user_terms_of_service.go +++ b/store/storetest/user_terms_of_service.go @@ -10,8 +10,8 @@ import ( "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/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func TestUserTermsOfServiceStore(t *testing.T, ss store.Store) { diff --git a/store/storetest/utils.go b/store/storetest/utils.go index d7821c25eb..7b8f06c3fb 100644 --- a/store/storetest/utils.go +++ b/store/storetest/utils.go @@ -4,7 +4,7 @@ package storetest import ( - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) // This function has a copy of it in app/helper_test diff --git a/store/storetest/webhook_store.go b/store/storetest/webhook_store.go index 5d5f79932f..c16624ff79 100644 --- a/store/storetest/webhook_store.go +++ b/store/storetest/webhook_store.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) func TestWebhookStore(t *testing.T, ss store.Store) { diff --git a/store/timerlayer/timerlayer.go b/store/timerlayer/timerlayer.go index d1ad303967..64cc0d178f 100644 --- a/store/timerlayer/timerlayer.go +++ b/store/timerlayer/timerlayer.go @@ -10,9 +10,9 @@ import ( "context" timemodule "time" - "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/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/store" ) type TimerLayer struct { diff --git a/testlib/cluster.go b/testlib/cluster.go index 750f945b1b..fd1ce73697 100644 --- a/testlib/cluster.go +++ b/testlib/cluster.go @@ -6,8 +6,8 @@ package testlib import ( "sync" - "github.com/mattermost/mattermost-server/v5/einterfaces" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" ) type FakeClusterInterface struct { diff --git a/testlib/helper.go b/testlib/helper.go index e1b87c0d1a..c8d53ace46 100644 --- a/testlib/helper.go +++ b/testlib/helper.go @@ -14,14 +14,14 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/searchengine" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store" - "github.com/mattermost/mattermost-server/v5/store/searchlayer" - "github.com/mattermost/mattermost-server/v5/store/sqlstore" - "github.com/mattermost/mattermost-server/v5/store/storetest" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/searchengine" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/store/searchlayer" + "github.com/mattermost/mattermost-server/v6/store/sqlstore" + "github.com/mattermost/mattermost-server/v6/store/storetest" + "github.com/mattermost/mattermost-server/v6/utils" ) type MainHelper struct { diff --git a/testlib/resources.go b/testlib/resources.go index a0757f3a17..a953bdbe70 100644 --- a/testlib/resources.go +++ b/testlib/resources.go @@ -12,10 +12,10 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/filestore" - "github.com/mattermost/mattermost-server/v5/utils" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/filestore" + "github.com/mattermost/mattermost-server/v6/utils" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) const ( diff --git a/testlib/store.go b/testlib/store.go index 4f8230cbb3..2382164a67 100644 --- a/testlib/store.go +++ b/testlib/store.go @@ -7,10 +7,10 @@ import ( "net/http" "strconv" - "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/mocks" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/v6/store" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) type TestStore struct { diff --git a/utils/api.go b/utils/api.go index 30718e8e90..bd8a5f81ec 100644 --- a/utils/api.go +++ b/utils/api.go @@ -14,8 +14,8 @@ import ( "path" "strings" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" ) func CheckOrigin(r *http.Request, allowedOrigins string) bool { diff --git a/utils/api_test.go b/utils/api_test.go index e790e6a4e3..d475ef5067 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/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestRenderWebError(t *testing.T) { diff --git a/utils/archive_test.go b/utils/archive_test.go index a37366a86b..37444311ab 100644 --- a/utils/archive_test.go +++ b/utils/archive_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) func TestSanitizePath(t *testing.T) { diff --git a/utils/authorization.go b/utils/authorization.go index af2be476af..a0b6727e5e 100644 --- a/utils/authorization.go +++ b/utils/authorization.go @@ -4,7 +4,7 @@ package utils import ( - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/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 617f23b1a7..f7a4abe622 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/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type RoleState struct { diff --git a/utils/i18n.go b/utils/i18n.go index f52ef7a1df..acbcda7c5c 100644 --- a/utils/i18n.go +++ b/utils/i18n.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) // this functions loads translations from filesystem if they are not diff --git a/utils/imgutils/gif_test.go b/utils/imgutils/gif_test.go index 24590130ec..ed65a16f80 100644 --- a/utils/imgutils/gif_test.go +++ b/utils/imgutils/gif_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/utils/testutils" + "github.com/mattermost/mattermost-server/v6/utils/testutils" ) func TestCountFrames(t *testing.T) { diff --git a/utils/jsonutils/json_test.go b/utils/jsonutils/json_test.go index 85d1be8a48..352db92af2 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/v5/utils/jsonutils" + "github.com/mattermost/mattermost-server/v6/utils/jsonutils" ) func TestHumanizeJsonError(t *testing.T) { diff --git a/utils/license.go b/utils/license.go index 8ce8226850..4067b5f461 100644 --- a/utils/license.go +++ b/utils/license.go @@ -17,9 +17,9 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) var publicKey []byte = []byte(`-----BEGIN PUBLIC KEY----- diff --git a/utils/logger.go b/utils/logger.go index 23d2558ee8..0de3fdb240 100644 --- a/utils/logger.go +++ b/utils/logger.go @@ -7,9 +7,9 @@ import ( "path/filepath" "strings" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) const ( diff --git a/utils/merge_test.go b/utils/merge_test.go index b9ff2c444a..e904d9a776 100644 --- a/utils/merge_test.go +++ b/utils/merge_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/utils" ) // Test merging maps alone. This isolates the complexity of merging maps from merging maps recursively in diff --git a/utils/mocks/LicenseValidatorIface.go b/utils/mocks/LicenseValidatorIface.go index 880d360a89..c444a05061 100644 --- a/utils/mocks/LicenseValidatorIface.go +++ b/utils/mocks/LicenseValidatorIface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v5/model" + model "github.com/mattermost/mattermost-server/v6/model" mock "github.com/stretchr/testify/mock" ) diff --git a/utils/subpath.go b/utils/subpath.go index 55870a49ca..078527244c 100644 --- a/utils/subpath.go +++ b/utils/subpath.go @@ -17,9 +17,9 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/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 0433935407..956653e730 100644 --- a/utils/subpath_test.go +++ b/utils/subpath_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/utils" ) func TestUpdateAssetsSubpathFromConfig(t *testing.T) { diff --git a/utils/testutils/static_config_service.go b/utils/testutils/static_config_service.go index 07500d9a63..6a4d4d2034 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/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) type StaticConfigService struct { diff --git a/utils/testutils/testutils.go b/utils/testutils/testutils.go index 02914fbf7f..4d9dd7ccc7 100644 --- a/utils/testutils/testutils.go +++ b/utils/testutils/testutils.go @@ -14,9 +14,9 @@ import ( "strconv" "time" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/utils" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) func ReadTestFile(name string) ([]byte, error) { diff --git a/utils/utils.go b/utils/utils.go index 39244b93f4..c2e1b7faeb 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -12,7 +12,7 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func StringInSlice(a string, slice []string) bool { diff --git a/web/context.go b/web/context.go index 43ea4d9868..83303531d1 100644 --- a/web/context.go +++ b/web/context.go @@ -9,13 +9,13 @@ import ( "regexp" "strings" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/utils" ) type Context struct { diff --git a/web/context_test.go b/web/context_test.go index 2d81f6abd1..f47049b0ab 100644 --- a/web/context_test.go +++ b/web/context_test.go @@ -11,10 +11,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/app/request" - "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/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) func TestRequireHookId(t *testing.T) { diff --git a/web/handlers.go b/web/handlers.go index 1f650a72a7..eb77a27d4b 100644 --- a/web/handlers.go +++ b/web/handlers.go @@ -19,15 +19,15 @@ import ( "github.com/opentracing/opentracing-go/ext" spanlog "github.com/opentracing/opentracing-go/log" - "github.com/mattermost/mattermost-server/v5/app" - app_opentracing "github.com/mattermost/mattermost-server/v5/app/opentracing" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/services/tracing" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store/opentracinglayer" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/app" + app_opentracing "github.com/mattermost/mattermost-server/v6/app/opentracing" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/services/tracing" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store/opentracinglayer" + "github.com/mattermost/mattermost-server/v6/utils" ) func GetHandlerName(h func(*Context, http.ResponseWriter, *http.Request)) string { diff --git a/web/handlers_test.go b/web/handlers_test.go index 340e399602..a45ac4849c 100644 --- a/web/handlers_test.go +++ b/web/handlers_test.go @@ -11,10 +11,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/app" - "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/v6/app" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) func handlerForHTTPErrors(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/web/main_test.go b/web/main_test.go index 5c245c9c5a..eebef55cc7 100644 --- a/web/main_test.go +++ b/web/main_test.go @@ -6,8 +6,8 @@ package web import ( "testing" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/testlib" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/testlib" ) var mainHelper *testlib.MainHelper diff --git a/web/oauth.go b/web/oauth.go index 785279a458..099948d33d 100644 --- a/web/oauth.go +++ b/web/oauth.go @@ -11,13 +11,13 @@ import ( "path/filepath" "strings" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/utils" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/utils" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) func (w *Web) InitOAuth() { diff --git a/web/oauth_test.go b/web/oauth_test.go index 10d7b1ffff..2ad225905d 100644 --- a/web/oauth_test.go +++ b/web/oauth_test.go @@ -18,12 +18,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/app/request" - "github.com/mattermost/mattermost-server/v5/einterfaces" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/einterfaces" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/utils" ) func TestOAuthComplete_AccessDenied(t *testing.T) { diff --git a/web/params.go b/web/params.go index 7f87624f09..bec2d26693 100644 --- a/web/params.go +++ b/web/params.go @@ -10,7 +10,7 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) const ( diff --git a/web/saml.go b/web/saml.go index 205c74ceb9..17bd52e931 100644 --- a/web/saml.go +++ b/web/saml.go @@ -10,10 +10,10 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/audit" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/utils" ) func (w *Web) InitSaml() { diff --git a/web/static.go b/web/static.go index 6ed5210912..6ea57acdd2 100644 --- a/web/static.go +++ b/web/static.go @@ -11,11 +11,11 @@ import ( "github.com/mattermost/gziphandler" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/shared/templates" - "github.com/mattermost/mattermost-server/v5/utils" - "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/shared/templates" + "github.com/mattermost/mattermost-server/v6/utils" + "github.com/mattermost/mattermost-server/v6/utils/fileutils" ) var robotsTxt = []byte("User-agent: *\nDisallow: /\n") diff --git a/web/unsupported_browser.go b/web/unsupported_browser.go index 9943e49c69..c0a7f41047 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/v5/app/request" - "github.com/mattermost/mattermost-server/v5/shared/templates" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/shared/templates" ) // MattermostApp describes downloads for the Mattermost App diff --git a/web/web.go b/web/web.go index c1af1bd326..f682ffd24e 100644 --- a/web/web.go +++ b/web/web.go @@ -11,10 +11,10 @@ import ( "github.com/avct/uasurfer" "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/utils" ) type Web struct { diff --git a/web/web_test.go b/web/web_test.go index 23fffd00e0..786b98e1b5 100644 --- a/web/web_test.go +++ b/web/web_test.go @@ -16,15 +16,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/app/request" - "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/shared/mlog" - "github.com/mattermost/mattermost-server/v5/store/localcachelayer" - "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/config" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/v6/shared/mlog" + "github.com/mattermost/mattermost-server/v6/store/localcachelayer" + "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v6/utils" ) var ApiClient *model.Client4 @@ -192,7 +192,7 @@ func TestStaticFilesRequest(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/plugin" ) type MyPlugin struct { @@ -279,7 +279,7 @@ func TestPublicFilesRequest(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v6/plugin" ) type MyPlugin struct { diff --git a/web/webhook.go b/web/webhook.go index 75d41e16e7..d47f3d434b 100644 --- a/web/webhook.go +++ b/web/webhook.go @@ -12,8 +12,8 @@ import ( "github.com/gorilla/mux" "github.com/gorilla/schema" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) func (w *Web) InitWebhooks() { diff --git a/web/webhook_test.go b/web/webhook_test.go index 723453b5be..d1bec45368 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/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func TestIncomingWebhook(t *testing.T) { diff --git a/wsapi/api.go b/wsapi/api.go index 8b1fdf7adf..ca01cbae4d 100644 --- a/wsapi/api.go +++ b/wsapi/api.go @@ -4,7 +4,7 @@ package wsapi import ( - "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v6/app" ) type API struct { diff --git a/wsapi/status.go b/wsapi/status.go index a5abd6f3d3..0951aecad2 100644 --- a/wsapi/status.go +++ b/wsapi/status.go @@ -4,8 +4,8 @@ package wsapi import ( - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) func (api *API) InitStatus() { diff --git a/wsapi/system.go b/wsapi/system.go index 237392d3ab..7733367811 100644 --- a/wsapi/system.go +++ b/wsapi/system.go @@ -4,7 +4,7 @@ package wsapi import ( - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitSystem() { diff --git a/wsapi/user.go b/wsapi/user.go index 607a0eab50..81f5bd33a4 100644 --- a/wsapi/user.go +++ b/wsapi/user.go @@ -4,7 +4,7 @@ package wsapi import ( - "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v6/model" ) func (api *API) InitUser() { diff --git a/wsapi/websocket_handler.go b/wsapi/websocket_handler.go index c90700e93b..529320236e 100644 --- a/wsapi/websocket_handler.go +++ b/wsapi/websocket_handler.go @@ -6,10 +6,10 @@ package wsapi import ( "net/http" - "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/v5/shared/i18n" - "github.com/mattermost/mattermost-server/v5/shared/mlog" + "github.com/mattermost/mattermost-server/v6/app" + "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/v6/shared/i18n" + "github.com/mattermost/mattermost-server/v6/shared/mlog" ) func (api *API) ApiWebSocketHandler(wh func(*model.WebSocketRequest) (map[string]interface{}, *model.AppError)) webSocketHandler {