Upgrade xorm to v0.8.0 (#8536)

114 files changed, 114 insertions, 114 deletions

diff --git a/models/attachment.go b/models/attachment.go
index a9032f1a86..f585bda8cb 100644
--- a/models/attachment.go
+++ b/models/attachment.go
@@ -14,8 +14,8 @@ import (
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
 	gouuid "github.com/satori/go.uuid"
+	"xorm.io/xorm"
 )
 
 // Attachment represent a attachment of issue/comment/release.
diff --git a/models/commit_status.go b/models/commit_status.go
index 6f6cbc387f..4e0f8166f3 100644
--- a/models/commit_status.go
+++ b/models/commit_status.go
@@ -16,7 +16,7 @@ import (
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 // CommitStatusState holds the state of a Status
diff --git a/models/gpg_key.go b/models/gpg_key.go
index 5cfe67435e..9b690475bd 100644
--- a/models/gpg_key.go
+++ b/models/gpg_key.go
@@ -20,10 +20,10 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
 	"github.com/keybase/go-crypto/openpgp"
 	"github.com/keybase/go-crypto/openpgp/armor"
 	"github.com/keybase/go-crypto/openpgp/packet"
+	"xorm.io/xorm"
 )
 
 // GPGKey represents a GPG key.
diff --git a/models/issue.go b/models/issue.go
index c55e96168f..525152552c 100644
--- a/models/issue.go
+++ b/models/issue.go
@@ -19,9 +19,9 @@ import (
 	"code.gitea.io/gitea/modules/timeutil"
 	"code.gitea.io/gitea/modules/util"
 
-	"github.com/go-xorm/xorm"
 	"github.com/unknwon/com"
 	"xorm.io/builder"
+	"xorm.io/xorm"
 )
 
 // Issue represents an issue or pull request of repository.
diff --git a/models/issue_assignees.go b/models/issue_assignees.go
index 1f504a9950..00ee498860 100644
--- a/models/issue_assignees.go
+++ b/models/issue_assignees.go
@@ -10,7 +10,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	api "code.gitea.io/gitea/modules/structs"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 // IssueAssignees saves all issue assignees
diff --git a/models/issue_comment.go b/models/issue_comment.go
index ffc3c006f5..d7128bdbac 100644
--- a/models/issue_comment.go
+++ b/models/issue_comment.go
@@ -18,9 +18,9 @@ import (
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
 	"github.com/unknwon/com"
 	"xorm.io/builder"
+	"xorm.io/xorm"
 )
 
 // CommentType defines whether a comment is just a simple comment, an action (like close) or a reference.
diff --git a/models/issue_label.go b/models/issue_label.go
index dab5ba2827..2b77c4bc35 100644
--- a/models/issue_label.go
+++ b/models/issue_label.go
@@ -13,8 +13,8 @@ import (
 
 	api "code.gitea.io/gitea/modules/structs"
 
-	"github.com/go-xorm/xorm"
 	"xorm.io/builder"
+	"xorm.io/xorm"
 )
 
 var labelColorPattern = regexp.MustCompile("#([a-fA-F0-9]{6})")
diff --git a/models/issue_milestone.go b/models/issue_milestone.go
index 1587e5e341..d32cb3c7d1 100644
--- a/models/issue_milestone.go
+++ b/models/issue_milestone.go
@@ -12,7 +12,7 @@ import (
 	"code.gitea.io/gitea/modules/timeutil"
 	"xorm.io/builder"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 // Milestone represents a milestone of repository.
diff --git a/models/issue_reaction.go b/models/issue_reaction.go
index ab644b4b3e..4596d32d06 100644
--- a/models/issue_reaction.go
+++ b/models/issue_reaction.go
@@ -11,8 +11,8 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
 	"xorm.io/builder"
+	"xorm.io/xorm"
 )
 
 // Reaction represents a reactions on issues and comments.
diff --git a/models/issue_tracked_time.go b/models/issue_tracked_time.go
index f9313b7653..f616836c85 100644
--- a/models/issue_tracked_time.go
+++ b/models/issue_tracked_time.go
@@ -10,8 +10,8 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
 
-	"github.com/go-xorm/xorm"
 	"xorm.io/builder"
+	"xorm.io/xorm"
 )
 
 // TrackedTime represents a time that was spent for a specific issue.
diff --git a/models/issue_user.go b/models/issue_user.go
index d55a0dc2fb..6974a4d3cc 100644
--- a/models/issue_user.go
+++ b/models/issue_user.go
@@ -7,7 +7,7 @@ package models
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 // IssueUser represents an issue-user relation.
diff --git a/models/issue_xref.go b/models/issue_xref.go
index 141a7e0e8c..4b01022bc5 100644
--- a/models/issue_xref.go
+++ b/models/issue_xref.go
@@ -8,8 +8,8 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/references"
 
-	"github.com/go-xorm/xorm"
 	"github.com/unknwon/com"
+	"xorm.io/xorm"
 )
 
 type crossReference struct {
diff --git a/models/lfs_lock.go b/models/lfs_lock.go
index 7ea1dc8660..ba1a452815 100644
--- a/models/lfs_lock.go
+++ b/models/lfs_lock.go
@@ -14,7 +14,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	api "code.gitea.io/gitea/modules/structs"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 // LFSLock represents a git lfs lock of repository.
diff --git a/models/login_source.go b/models/login_source.go
index 9381ed034f..ce03c4154f 100644
--- a/models/login_source.go
+++ b/models/login_source.go
@@ -21,9 +21,9 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
 	"github.com/unknwon/com"
 	"xorm.io/core"
+	"xorm.io/xorm"
 )
 
 // LoginType represents an login type.
diff --git a/models/migrate.go b/models/migrate.go
index 85be3a312c..53838fd65e 100644
--- a/models/migrate.go
+++ b/models/migrate.go
@@ -4,7 +4,7 @@
 
 package models
 
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
 
 // InsertMilestones creates milestones of repository.
 func InsertMilestones(ms ...*Milestone) (err error) {
diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index 60a416c6e9..ef4f5b823f 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -21,10 +21,10 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
 	gouuid "github.com/satori/go.uuid"
 	"github.com/unknwon/com"
 	ini "gopkg.in/ini.v1"
+	"xorm.io/xorm"
 )
 
 const minDBVersion = 4
diff --git a/models/migrations/v100.go b/models/migrations/v100.go
index ac3b73e2ad..6a4e98af1f 100644
--- a/models/migrations/v100.go
+++ b/models/migrations/v100.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func updateMigrationServiceTypes(x *xorm.Engine) error {
diff --git a/models/migrations/v13.go b/models/migrations/v13.go
index 8b6b38cadf..3c35b66ab9 100644
--- a/models/migrations/v13.go
+++ b/models/migrations/v13.go
@@ -9,8 +9,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/go-xorm/xorm"
 	"github.com/unknwon/com"
+	"xorm.io/xorm"
 )
 
 func ldapUseSSLToSecurityProtocol(x *xorm.Engine) error {
diff --git a/models/migrations/v14.go b/models/migrations/v14.go
index 392f9fdba6..675c7459dd 100644
--- a/models/migrations/v14.go
+++ b/models/migrations/v14.go
@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func setCommentUpdatedWithCreated(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v15.go b/models/migrations/v15.go
index 3492a7190b..8872f1e946 100644
--- a/models/migrations/v15.go
+++ b/models/migrations/v15.go
@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func createAllowCreateOrganizationColumn(x *xorm.Engine) error {
diff --git a/models/migrations/v16.go b/models/migrations/v16.go
index 5b8ec19d32..a849205b55 100644
--- a/models/migrations/v16.go
+++ b/models/migrations/v16.go
@@ -10,7 +10,7 @@ import (
 
 	"code.gitea.io/gitea/modules/markup"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 // Enumerate all the unit types
diff --git a/models/migrations/v17.go b/models/migrations/v17.go
index 2986badc97..2907b009db 100644
--- a/models/migrations/v17.go
+++ b/models/migrations/v17.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func setProtectedBranchUpdatedWithCreated(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v18.go b/models/migrations/v18.go
index 3b3cd23ccf..66a1de3499 100644
--- a/models/migrations/v18.go
+++ b/models/migrations/v18.go
@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 // ExternalLoginUser makes the connecting between some existing user and additional external login sources
diff --git a/models/migrations/v19.go b/models/migrations/v19.go
index 7728f5add6..349d5850aa 100644
--- a/models/migrations/v19.go
+++ b/models/migrations/v19.go
@@ -13,8 +13,8 @@ import (
 
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
 	"github.com/unknwon/com"
+	"xorm.io/xorm"
 )
 
 func generateAndMigrateGitHooks(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v20.go b/models/migrations/v20.go
index ded99e09ce..0897eada74 100644
--- a/models/migrations/v20.go
+++ b/models/migrations/v20.go
@@ -16,7 +16,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func useNewNameAvatars(x *xorm.Engine) error {
diff --git a/models/migrations/v21.go b/models/migrations/v21.go
index 65cae2ac03..2750725760 100644
--- a/models/migrations/v21.go
+++ b/models/migrations/v21.go
@@ -11,8 +11,8 @@ import (
 
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
 	"github.com/unknwon/com"
+	"xorm.io/xorm"
 )
 
 const (
diff --git a/models/migrations/v22.go b/models/migrations/v22.go
index faac74343b..eb37aec17f 100644
--- a/models/migrations/v22.go
+++ b/models/migrations/v22.go
@@ -13,8 +13,8 @@ import (
 
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
 	"github.com/unknwon/com"
+	"xorm.io/xorm"
 )
 
 func generateAndMigrateWikiGitHooks(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v23.go b/models/migrations/v23.go
index 4aadf7ef0d..50dc6cd2c7 100644
--- a/models/migrations/v23.go
+++ b/models/migrations/v23.go
@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 // UserOpenID is the list of all OpenID identities of a user.
diff --git a/models/migrations/v24.go b/models/migrations/v24.go
index 076c710cc3..20791d7981 100644
--- a/models/migrations/v24.go
+++ b/models/migrations/v24.go
@@ -7,7 +7,7 @@ package migrations
 import (
 	"time"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func changeGPGKeysColumns(x *xorm.Engine) error {
diff --git a/models/migrations/v25.go b/models/migrations/v25.go
index a8d746590a..da74e27c28 100644
--- a/models/migrations/v25.go
+++ b/models/migrations/v25.go
@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addUserOpenIDShow(x *xorm.Engine) error {
diff --git a/models/migrations/v26.go b/models/migrations/v26.go
index 04277191f5..03ce2ef94b 100644
--- a/models/migrations/v26.go
+++ b/models/migrations/v26.go
@@ -16,8 +16,8 @@ import (
 
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
 	"github.com/unknwon/com"
+	"xorm.io/xorm"
 )
 
 func generateAndMigrateGitHookChains(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v27.go b/models/migrations/v27.go
index 12e5fbcdbf..2bba0b7412 100644
--- a/models/migrations/v27.go
+++ b/models/migrations/v27.go
@@ -11,7 +11,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func convertIntervalToDuration(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v28.go b/models/migrations/v28.go
index a30cbf2afb..587e944ce6 100644
--- a/models/migrations/v28.go
+++ b/models/migrations/v28.go
@@ -14,7 +14,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addRepoSize(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v29.go b/models/migrations/v29.go
index eadb0f3d87..ea70a2dd77 100644
--- a/models/migrations/v29.go
+++ b/models/migrations/v29.go
@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 // CommitStatus see models/status.go
diff --git a/models/migrations/v30.go b/models/migrations/v30.go
index 90047df8b6..5acdc5dac7 100644
--- a/models/migrations/v30.go
+++ b/models/migrations/v30.go
@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addExternalLoginUserPK(x *xorm.Engine) error {
diff --git a/models/migrations/v31.go b/models/migrations/v31.go
index d6cea4c51b..b3aef0d665 100644
--- a/models/migrations/v31.go
+++ b/models/migrations/v31.go
@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/go-xorm/xorm"
 	"xorm.io/core"
+	"xorm.io/xorm"
 )
 
 func addLoginSourceSyncEnabledColumn(x *xorm.Engine) error {
diff --git a/models/migrations/v32.go b/models/migrations/v32.go
index d209fc34f6..f5c021cccf 100644
--- a/models/migrations/v32.go
+++ b/models/migrations/v32.go
@@ -4,7 +4,7 @@
 
 package migrations
 
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
 
 func addUnitsToRepoTeam(x *xorm.Engine) error {
 	type Team struct {
diff --git a/models/migrations/v33.go b/models/migrations/v33.go
index 566951db96..625c5f4a53 100644
--- a/models/migrations/v33.go
+++ b/models/migrations/v33.go
@@ -10,7 +10,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func removeActionColumns(x *xorm.Engine) error {
diff --git a/models/migrations/v34.go b/models/migrations/v34.go
index 258da41c04..26f0f565f7 100644
--- a/models/migrations/v34.go
+++ b/models/migrations/v34.go
@@ -5,7 +5,7 @@
 package migrations
 
 import (
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 // Team see models/team.go
diff --git a/models/migrations/v35.go b/models/migrations/v35.go
index 7746663a40..d5059c7998 100644
--- a/models/migrations/v35.go
+++ b/models/migrations/v35.go
@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addCommentIDToAction(x *xorm.Engine) error {
diff --git a/models/migrations/v36.go b/models/migrations/v36.go
index 06f76a26d6..729019925e 100644
--- a/models/migrations/v36.go
+++ b/models/migrations/v36.go
@@ -7,7 +7,7 @@ package migrations
 import (
 	"code.gitea.io/gitea/models"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func regenerateGitHooks36(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v37.go b/models/migrations/v37.go
index 00653a780d..29e1c966f3 100644
--- a/models/migrations/v37.go
+++ b/models/migrations/v37.go
@@ -7,7 +7,7 @@ package migrations
 import (
 	"html"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func unescapeUserFullNames(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v38.go b/models/migrations/v38.go
index 6060b70fe8..4e4e6628d3 100644
--- a/models/migrations/v38.go
+++ b/models/migrations/v38.go
@@ -9,8 +9,8 @@ import (
 
 	"code.gitea.io/gitea/models"
 
-	"github.com/go-xorm/xorm"
 	"xorm.io/core"
+	"xorm.io/xorm"
 )
 
 func removeCommitsUnitType(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v39.go b/models/migrations/v39.go
index 1312cb3313..f3b32ea873 100644
--- a/models/migrations/v39.go
+++ b/models/migrations/v39.go
@@ -11,7 +11,7 @@ import (
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/log"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 // ReleaseV39 describes the added field for Release
diff --git a/models/migrations/v40.go b/models/migrations/v40.go
index fffe158bf9..944377ce9b 100644
--- a/models/migrations/v40.go
+++ b/models/migrations/v40.go
@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func fixProtectedBranchCanPushValue(x *xorm.Engine) error {
diff --git a/models/migrations/v41.go b/models/migrations/v41.go
index 4de3ad4e99..928bb1cd3f 100644
--- a/models/migrations/v41.go
+++ b/models/migrations/v41.go
@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func removeDuplicateUnitTypes(x *xorm.Engine) error {
diff --git a/models/migrations/v45.go b/models/migrations/v45.go
index 99baff2c8b..eb346d7b3a 100644
--- a/models/migrations/v45.go
+++ b/models/migrations/v45.go
@@ -8,7 +8,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func removeIndexColumnFromRepoUnitTable(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v46.go b/models/migrations/v46.go
index b6dd059c94..3d9c1329d8 100644
--- a/models/migrations/v46.go
+++ b/models/migrations/v46.go
@@ -5,7 +5,7 @@
 package migrations
 
 import (
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func removeOrganizationWatchRepo(x *xorm.Engine) error {
diff --git a/models/migrations/v47.go b/models/migrations/v47.go
index 7a217e6f01..81f92e2f5a 100644
--- a/models/migrations/v47.go
+++ b/models/migrations/v47.go
@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addDeletedBranch(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v48.go b/models/migrations/v48.go
index 6cea66b5ac..6365feba89 100644
--- a/models/migrations/v48.go
+++ b/models/migrations/v48.go
@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addRepoIndexerStatus(x *xorm.Engine) error {
diff --git a/models/migrations/v49.go b/models/migrations/v49.go
index 9e98de5cf2..4776125137 100644
--- a/models/migrations/v49.go
+++ b/models/migrations/v49.go
@@ -10,7 +10,7 @@ import (
 
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addTimetracking(x *xorm.Engine) error {
diff --git a/models/migrations/v50.go b/models/migrations/v50.go
index 23b1bb526e..ddc378b432 100644
--- a/models/migrations/v50.go
+++ b/models/migrations/v50.go
@@ -10,7 +10,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func migrateProtectedBranchStruct(x *xorm.Engine) error {
diff --git a/models/migrations/v51.go b/models/migrations/v51.go
index 85e903bbe7..8dadcf3349 100644
--- a/models/migrations/v51.go
+++ b/models/migrations/v51.go
@@ -8,7 +8,7 @@ import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/log"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addDefaultValueToUserProhibitLogin(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v52.go b/models/migrations/v52.go
index ab57d27de0..6547698d5b 100644
--- a/models/migrations/v52.go
+++ b/models/migrations/v52.go
@@ -10,7 +10,7 @@ import (
 
 	"code.gitea.io/gitea/models"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addLFSLock(x *xorm.Engine) error {
diff --git a/models/migrations/v53.go b/models/migrations/v53.go
index 7437cace25..a3068cdb00 100644
--- a/models/migrations/v53.go
+++ b/models/migrations/v53.go
@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addReactions(x *xorm.Engine) error {
diff --git a/models/migrations/v54.go b/models/migrations/v54.go
index 5194624f69..af1e287419 100644
--- a/models/migrations/v54.go
+++ b/models/migrations/v54.go
@@ -9,7 +9,7 @@ import (
 
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addPullRequestOptions(x *xorm.Engine) error {
diff --git a/models/migrations/v55.go b/models/migrations/v55.go
index c20c51616e..a259e4f001 100644
--- a/models/migrations/v55.go
+++ b/models/migrations/v55.go
@@ -9,7 +9,7 @@ import (
 
 	"code.gitea.io/gitea/models"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addModeToDeploKeys(x *xorm.Engine) error {
diff --git a/models/migrations/v56.go b/models/migrations/v56.go
index 79f8ce0ba5..4e1cafcca2 100644
--- a/models/migrations/v56.go
+++ b/models/migrations/v56.go
@@ -5,7 +5,7 @@
 package migrations
 
 import (
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func removeIsOwnerColumnFromOrgUser(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v57.go b/models/migrations/v57.go
index fe4bf6b0ee..6c0ab6f496 100644
--- a/models/migrations/v57.go
+++ b/models/migrations/v57.go
@@ -9,7 +9,7 @@ import (
 
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addIssueClosedTime(x *xorm.Engine) error {
diff --git a/models/migrations/v58.go b/models/migrations/v58.go
index 6ec24b08c8..0fa3bcfe2d 100644
--- a/models/migrations/v58.go
+++ b/models/migrations/v58.go
@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addLabelsDescriptions(x *xorm.Engine) error {
diff --git a/models/migrations/v59.go b/models/migrations/v59.go
index 0a05495e76..d442f2569e 100644
--- a/models/migrations/v59.go
+++ b/models/migrations/v59.go
@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addProtectedBranchMergeWhitelist(x *xorm.Engine) error {
diff --git a/models/migrations/v60.go b/models/migrations/v60.go
index 13ec38241a..6482e8e4a5 100644
--- a/models/migrations/v60.go
+++ b/models/migrations/v60.go
@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addFsckEnabledToRepo(x *xorm.Engine) error {
diff --git a/models/migrations/v61.go b/models/migrations/v61.go
index 8d9b7e2d23..13affaf068 100644
--- a/models/migrations/v61.go
+++ b/models/migrations/v61.go
@@ -12,7 +12,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addSizeToAttachment(x *xorm.Engine) error {
diff --git a/models/migrations/v62.go b/models/migrations/v62.go
index 0c2966854b..e7f6cf6890 100644
--- a/models/migrations/v62.go
+++ b/models/migrations/v62.go
@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addLastUsedPasscodeTOTP(x *xorm.Engine) error {
diff --git a/models/migrations/v63.go b/models/migrations/v63.go
index 6e7d940edc..62e8a299f6 100644
--- a/models/migrations/v63.go
+++ b/models/migrations/v63.go
@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addLanguageSetting(x *xorm.Engine) error {
diff --git a/models/migrations/v64.go b/models/migrations/v64.go
index 00637ca046..623cceddbc 100644
--- a/models/migrations/v64.go
+++ b/models/migrations/v64.go
@@ -7,7 +7,7 @@ package migrations
 import (
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addMultipleAssignees(x *xorm.Engine) error {
diff --git a/models/migrations/v65.go b/models/migrations/v65.go
index cc199d34e2..a87f8bc76c 100644
--- a/models/migrations/v65.go
+++ b/models/migrations/v65.go
@@ -3,7 +3,7 @@ package migrations
 import (
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addU2FReg(x *xorm.Engine) error {
diff --git a/models/migrations/v66.go b/models/migrations/v66.go
index 43acfb4ea5..8e9df97fea 100644
--- a/models/migrations/v66.go
+++ b/models/migrations/v66.go
@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addLoginSourceIDToPublicKeyTable(x *xorm.Engine) error {
diff --git a/models/migrations/v67.go b/models/migrations/v67.go
index 6cf3dd4d19..dee744e4d3 100644
--- a/models/migrations/v67.go
+++ b/models/migrations/v67.go
@@ -9,7 +9,7 @@ import (
 
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func removeStaleWatches(x *xorm.Engine) error {
diff --git a/models/migrations/v68.go b/models/migrations/v68.go
index d9e80ca80e..41c1f8f71d 100644
--- a/models/migrations/v68.go
+++ b/models/migrations/v68.go
@@ -11,7 +11,7 @@ import (
 
 	"code.gitea.io/gitea/modules/log"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 var topicPattern = regexp.MustCompile(`^[a-z0-9][a-z0-9-]*$`)
diff --git a/models/migrations/v69.go b/models/migrations/v69.go
index 9a6e42e712..a08747edff 100644
--- a/models/migrations/v69.go
+++ b/models/migrations/v69.go
@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func moveTeamUnitsToTeamUnitTable(x *xorm.Engine) error {
diff --git a/models/migrations/v70.go b/models/migrations/v70.go
index 4ce1d4ee53..ef8dd85d6d 100644
--- a/models/migrations/v70.go
+++ b/models/migrations/v70.go
@@ -10,7 +10,7 @@ import (
 
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addIssueDependencies(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v71.go b/models/migrations/v71.go
index 004f0a3f51..0b6aff61b2 100644
--- a/models/migrations/v71.go
+++ b/models/migrations/v71.go
@@ -11,8 +11,8 @@ import (
 	"code.gitea.io/gitea/modules/generate"
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
 	"golang.org/x/crypto/pbkdf2"
+	"xorm.io/xorm"
 )
 
 func addScratchHash(x *xorm.Engine) error {
diff --git a/models/migrations/v72.go b/models/migrations/v72.go
index c99b46afd2..612f58aab5 100644
--- a/models/migrations/v72.go
+++ b/models/migrations/v72.go
@@ -9,7 +9,7 @@ import (
 
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addReview(x *xorm.Engine) error {
diff --git a/models/migrations/v73.go b/models/migrations/v73.go
index 1265b4519e..0c06e2ba5c 100644
--- a/models/migrations/v73.go
+++ b/models/migrations/v73.go
@@ -5,7 +5,7 @@
 package migrations
 
 import (
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addMustChangePassword(x *xorm.Engine) error {
diff --git a/models/migrations/v74.go b/models/migrations/v74.go
index 66e958c7fa..f3b38418b7 100644
--- a/models/migrations/v74.go
+++ b/models/migrations/v74.go
@@ -4,7 +4,7 @@
 
 package migrations
 
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
 
 func addApprovalWhitelistsToProtectedBranches(x *xorm.Engine) error {
 	type ProtectedBranch struct {
diff --git a/models/migrations/v75.go b/models/migrations/v75.go
index 58d1d34c98..208153b9b0 100644
--- a/models/migrations/v75.go
+++ b/models/migrations/v75.go
@@ -5,8 +5,8 @@
 package migrations
 
 import (
-	"github.com/go-xorm/xorm"
 	"xorm.io/builder"
+	"xorm.io/xorm"
 )
 
 func clearNonusedData(x *xorm.Engine) error {
diff --git a/models/migrations/v76.go b/models/migrations/v76.go
index e1fd6f100b..545bff64c5 100644
--- a/models/migrations/v76.go
+++ b/models/migrations/v76.go
@@ -9,7 +9,7 @@ import (
 
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addPullRequestRebaseWithMerge(x *xorm.Engine) error {
diff --git a/models/migrations/v77.go b/models/migrations/v77.go
index c564d4cf54..d62fbe7fb6 100644
--- a/models/migrations/v77.go
+++ b/models/migrations/v77.go
@@ -5,7 +5,7 @@
 package migrations
 
 import (
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addUserDefaultTheme(x *xorm.Engine) error {
diff --git a/models/migrations/v78.go b/models/migrations/v78.go
index 8082996b6f..e4274ca605 100644
--- a/models/migrations/v78.go
+++ b/models/migrations/v78.go
@@ -5,7 +5,7 @@
 package migrations
 
 import (
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func renameRepoIsBareToIsEmpty(x *xorm.Engine) error {
diff --git a/models/migrations/v79.go b/models/migrations/v79.go
index e246393957..3c3e77b8db 100644
--- a/models/migrations/v79.go
+++ b/models/migrations/v79.go
@@ -7,7 +7,7 @@ package migrations
 import (
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addCanCloseIssuesViaCommitInAnyBranch(x *xorm.Engine) error {
diff --git a/models/migrations/v80.go b/models/migrations/v80.go
index d9040da601..3c1b3315cf 100644
--- a/models/migrations/v80.go
+++ b/models/migrations/v80.go
@@ -4,7 +4,7 @@
 
 package migrations
 
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
 
 func addIsLockedToIssues(x *xorm.Engine) error {
 	// Issue see models/issue.go
diff --git a/models/migrations/v81.go b/models/migrations/v81.go
index 48e96508d9..271d479a64 100644
--- a/models/migrations/v81.go
+++ b/models/migrations/v81.go
@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func changeU2FCounterType(x *xorm.Engine) error {
diff --git a/models/migrations/v82.go b/models/migrations/v82.go
index eb73f18343..3fb4b6c59e 100644
--- a/models/migrations/v82.go
+++ b/models/migrations/v82.go
@@ -10,7 +10,7 @@ import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/git"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func fixReleaseSha1OnReleaseTable(x *xorm.Engine) error {
diff --git a/models/migrations/v83.go b/models/migrations/v83.go
index cdc59292ab..6707dbdf81 100644
--- a/models/migrations/v83.go
+++ b/models/migrations/v83.go
@@ -7,7 +7,7 @@ package migrations
 import (
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addUploaderIDForAttachment(x *xorm.Engine) error {
diff --git a/models/migrations/v84.go b/models/migrations/v84.go
index 4acb94b9ce..baab29fcd7 100644
--- a/models/migrations/v84.go
+++ b/models/migrations/v84.go
@@ -5,7 +5,7 @@
 package migrations
 
 import (
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addGPGKeyImport(x *xorm.Engine) error {
diff --git a/models/migrations/v85.go b/models/migrations/v85.go
index 6066d5ebe9..8c92f10b6e 100644
--- a/models/migrations/v85.go
+++ b/models/migrations/v85.go
@@ -11,7 +11,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func hashAppToken(x *xorm.Engine) error {
diff --git a/models/migrations/v86.go b/models/migrations/v86.go
index 492a08c71e..39c196ca6a 100644
--- a/models/migrations/v86.go
+++ b/models/migrations/v86.go
@@ -5,7 +5,7 @@
 package migrations
 
 import (
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addHTTPMethodToWebhook(x *xorm.Engine) error {
diff --git a/models/migrations/v87.go b/models/migrations/v87.go
index c8c7011a08..6b5af5be33 100644
--- a/models/migrations/v87.go
+++ b/models/migrations/v87.go
@@ -5,7 +5,7 @@
 package migrations
 
 import (
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addAvatarFieldToRepository(x *xorm.Engine) error {
diff --git a/models/migrations/v88.go b/models/migrations/v88.go
index fef425db0a..7318995a8c 100644
--- a/models/migrations/v88.go
+++ b/models/migrations/v88.go
@@ -8,7 +8,7 @@ import (
 	"crypto/sha1"
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func hashContext(context string) string {
diff --git a/models/migrations/v89.go b/models/migrations/v89.go
index 83d0b1a8b9..a972b07b6d 100644
--- a/models/migrations/v89.go
+++ b/models/migrations/v89.go
@@ -4,7 +4,7 @@
 
 package migrations
 
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
 
 func addOriginalMigrationInfo(x *xorm.Engine) error {
 	// Issue see models/issue.go
diff --git a/models/migrations/v90.go b/models/migrations/v90.go
index 09aceae2f9..72f7534dc8 100644
--- a/models/migrations/v90.go
+++ b/models/migrations/v90.go
@@ -4,7 +4,7 @@
 
 package migrations
 
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
 
 func changeSomeColumnsLengthOfRepo(x *xorm.Engine) error {
 	type Repository struct {
diff --git a/models/migrations/v91.go b/models/migrations/v91.go
index fea71b5d3b..3c49d9b96a 100644
--- a/models/migrations/v91.go
+++ b/models/migrations/v91.go
@@ -4,7 +4,7 @@
 
 package migrations
 
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
 
 func addIndexOnRepositoryAndComment(x *xorm.Engine) error {
 	type Repository struct {
diff --git a/models/migrations/v92.go b/models/migrations/v92.go
index 090332f151..7ad5118176 100644
--- a/models/migrations/v92.go
+++ b/models/migrations/v92.go
@@ -5,8 +5,8 @@
 package migrations
 
 import (
-	"github.com/go-xorm/xorm"
 	"xorm.io/builder"
+	"xorm.io/xorm"
 )
 
 func removeLingeringIndexStatus(x *xorm.Engine) error {
diff --git a/models/migrations/v93.go b/models/migrations/v93.go
index 0b0441cd5d..0cb9d6631f 100644
--- a/models/migrations/v93.go
+++ b/models/migrations/v93.go
@@ -4,7 +4,7 @@
 
 package migrations
 
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
 
 func addEmailNotificationEnabledToUser(x *xorm.Engine) error {
 	// User see models/user.go
diff --git a/models/migrations/v94.go b/models/migrations/v94.go
index 5fe8c3fa12..8c1e33b647 100644
--- a/models/migrations/v94.go
+++ b/models/migrations/v94.go
@@ -4,7 +4,7 @@
 
 package migrations
 
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
 
 func addStatusCheckColumnsForProtectedBranches(x *xorm.Engine) error {
 	type ProtectedBranch struct {
diff --git a/models/migrations/v95.go b/models/migrations/v95.go
index f6e4e41c48..94787f7501 100644
--- a/models/migrations/v95.go
+++ b/models/migrations/v95.go
@@ -4,7 +4,7 @@
 
 package migrations
 
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
 
 func addCrossReferenceColumns(x *xorm.Engine) error {
 	// Comment see models/comment.go
diff --git a/models/migrations/v96.go b/models/migrations/v96.go
index 34f67534c2..b8eb201591 100644
--- a/models/migrations/v96.go
+++ b/models/migrations/v96.go
@@ -10,7 +10,7 @@ import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func deleteOrphanedAttachments(x *xorm.Engine) error {
diff --git a/models/migrations/v97.go b/models/migrations/v97.go
index fa542f2ccd..8e58886e2e 100644
--- a/models/migrations/v97.go
+++ b/models/migrations/v97.go
@@ -4,7 +4,7 @@
 
 package migrations
 
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
 
 func addRepoAdminChangeTeamAccessColumnForUser(x *xorm.Engine) error {
 	type User struct {
diff --git a/models/migrations/v98.go b/models/migrations/v98.go
index 3b9fdbb1c5..617e1ec3d7 100644
--- a/models/migrations/v98.go
+++ b/models/migrations/v98.go
@@ -4,7 +4,7 @@
 
 package migrations
 
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
 
 func addOriginalAuthorOnMigratedReleases(x *xorm.Engine) error {
 	type Release struct {
diff --git a/models/migrations/v99.go b/models/migrations/v99.go
index 3eb287af6c..00b4509721 100644
--- a/models/migrations/v99.go
+++ b/models/migrations/v99.go
@@ -8,7 +8,7 @@ import (
 	"code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addTaskTable(x *xorm.Engine) error {
diff --git a/models/models.go b/models/models.go
index ea550cb839..0454ec6add 100644
--- a/models/models.go
+++ b/models/models.go
@@ -14,8 +14,8 @@ import (
 
 	// Needed for the MySQL driver
 	_ "github.com/go-sql-driver/mysql"
-	"github.com/go-xorm/xorm"
 	"xorm.io/core"
+	"xorm.io/xorm"
 
 	// Needed for the Postgresql driver
 	_ "github.com/lib/pq"
diff --git a/models/oauth2_application.go b/models/oauth2_application.go
index 46355a0b3f..4df207ae16 100644
--- a/models/oauth2_application.go
+++ b/models/oauth2_application.go
@@ -16,10 +16,10 @@ import (
 	"code.gitea.io/gitea/modules/timeutil"
 
 	"github.com/dgrijalva/jwt-go"
-	"github.com/go-xorm/xorm"
 	uuid "github.com/satori/go.uuid"
 	"github.com/unknwon/com"
 	"golang.org/x/crypto/bcrypt"
+	"xorm.io/xorm"
 )
 
 // OAuth2Application represents an OAuth2 client (RFC 6749)
diff --git a/models/org.go b/models/org.go
index ca3bce81a1..2cc302dac6 100644
--- a/models/org.go
+++ b/models/org.go
@@ -14,9 +14,9 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/structs"
 
-	"github.com/go-xorm/xorm"
 	"github.com/unknwon/com"
 	"xorm.io/builder"
+	"xorm.io/xorm"
 )
 
 // IsOwnedBy returns true if given user is in the owner team.
diff --git a/models/org_team.go b/models/org_team.go
index 10d53e3a86..a7a179f104 100644
--- a/models/org_team.go
+++ b/models/org_team.go
@@ -14,8 +14,8 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
 	"xorm.io/builder"
+	"xorm.io/xorm"
 )
 
 const ownerTeamName = "Owners"
diff --git a/models/pull.go b/models/pull.go
index 962e433fb0..817ea09cca 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -25,8 +25,8 @@ import (
 	"code.gitea.io/gitea/modules/sync"
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
 	"github.com/unknwon/com"
+	"xorm.io/xorm"
 )
 
 var pullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength)
diff --git a/models/repo.go b/models/repo.go
index 06708d24ab..3b5395ce16 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -37,11 +37,11 @@ import (
 	"code.gitea.io/gitea/modules/sync"
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
 	"github.com/mcuadros/go-version"
 	"github.com/unknwon/com"
 	ini "gopkg.in/ini.v1"
 	"xorm.io/builder"
+	"xorm.io/xorm"
 )
 
 var repoWorkingPool = sync.NewExclusivePool()
diff --git a/models/repo_activity.go b/models/repo_activity.go
index 04612ae1ef..aa5c2217e0 100644
--- a/models/repo_activity.go
+++ b/models/repo_activity.go
@@ -11,7 +11,7 @@ import (
 
 	"code.gitea.io/gitea/modules/git"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 // ActivityAuthorData represents statistical git commit count data
diff --git a/models/repo_mirror.go b/models/repo_mirror.go
index 4e91ea296a..aa0ec26808 100644
--- a/models/repo_mirror.go
+++ b/models/repo_mirror.go
@@ -11,7 +11,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 // Mirror represents mirror information of a repository.
diff --git a/models/repo_unit.go b/models/repo_unit.go
index 2fc1c40fa2..a6162a65e5 100644
--- a/models/repo_unit.go
+++ b/models/repo_unit.go
@@ -9,9 +9,9 @@ import (
 
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
 	"github.com/unknwon/com"
 	"xorm.io/core"
+	"xorm.io/xorm"
 )
 
 // RepoUnit describes all units of a repository
diff --git a/models/review.go b/models/review.go
index 454d16ee88..58660b2e3d 100644
--- a/models/review.go
+++ b/models/review.go
@@ -10,9 +10,9 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
 	"xorm.io/builder"
 	"xorm.io/core"
+	"xorm.io/xorm"
 )
 
 // ReviewType defines the sort of feedback a review gives
diff --git a/models/ssh_key.go b/models/ssh_key.go
index d1132bf0c6..69699f24c1 100644
--- a/models/ssh_key.go
+++ b/models/ssh_key.go
@@ -28,10 +28,10 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
 	"github.com/unknwon/com"
 	"golang.org/x/crypto/ssh"
 	"xorm.io/builder"
+	"xorm.io/xorm"
 )
 
 const (
diff --git a/models/unit_tests.go b/models/unit_tests.go
index b53302dad4..eb4da37fe5 100644
--- a/models/unit_tests.go
+++ b/models/unit_tests.go
@@ -17,11 +17,11 @@ import (
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
 	"github.com/stretchr/testify/assert"
 	"github.com/unknwon/com"
 	"gopkg.in/testfixtures.v2"
 	"xorm.io/core"
+	"xorm.io/xorm"
 )
 
 // NonexistentID an ID that will never exist
diff --git a/models/user.go b/models/user.go
index 030e23c383..c393d8dce5 100644
--- a/models/user.go
+++ b/models/user.go
@@ -33,7 +33,6 @@ import (
 	"code.gitea.io/gitea/modules/timeutil"
 	"code.gitea.io/gitea/modules/util"
 
-	"github.com/go-xorm/xorm"
 	"github.com/unknwon/com"
 	"golang.org/x/crypto/argon2"
 	"golang.org/x/crypto/bcrypt"
@@ -41,6 +40,7 @@ import (
 	"golang.org/x/crypto/scrypt"
 	"golang.org/x/crypto/ssh"
 	"xorm.io/builder"
+	"xorm.io/xorm"
 )
 
 // UserType defines the user type