Bump blocking-slick

build.sbt

@@ -36,7 +36,7 @@ libraryDependencies ++= Seq(
   "org.apache.httpcomponents"       %  "httpclient"                   % "4.5.1",
   "org.apache.sshd"                 %  "apache-sshd"                  % "1.2.0",
   "org.apache.tika"                 %  "tika-core"                    % "1.13",
-  "com.github.takezoe"              %% "blocking-slick"               % "0.0.3",
+  "com.github.takezoe"              %% "blocking-slick-32"            % "0.0.6-SNAPSHOT",
   "joda-time"                       %  "joda-time"                    % "2.9.6",
   "com.novell.ldap"                 %  "jldap"                        % "2009-10-07",
   "com.h2database"                  %  "h2"                           % "1.4.192",

src/main/scala/gitbucket/core/service/AccessTokenService.scala

@@ -1,7 +1,6 @@
 package gitbucket.core.service
 
 import gitbucket.core.model.Profile._
-import gitbucket.core.model.Profile.profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.model.{Account, AccessToken}
 import gitbucket.core.util.StringUtil

src/main/scala/gitbucket/core/service/AccountService.scala

@@ -3,7 +3,6 @@ package gitbucket.core.service
 import org.slf4j.LoggerFactory
 import gitbucket.core.model.{GroupMember, Account}
 import gitbucket.core.model.Profile._
-import gitbucket.core.model.Profile.profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.model.Profile.dateColumnType
 import gitbucket.core.util.{StringUtil, LDAPUtil}

src/main/scala/gitbucket/core/service/ActivityService.scala

@@ -3,7 +3,6 @@ package gitbucket.core.service
 import gitbucket.core.model.Activity
 import gitbucket.core.util.JGitUtil
 import gitbucket.core.model.Profile._
-import gitbucket.core.model.Profile.profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
 
 trait ActivityService {

src/main/scala/gitbucket/core/service/CommitStatusService.scala

@@ -1,7 +1,6 @@
 package gitbucket.core.service
 
 import gitbucket.core.model.Profile._
-import gitbucket.core.model.Profile.profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.model.Profile.dateColumnType
 import gitbucket.core.model.{CommitState, CommitStatus, Account}

src/main/scala/gitbucket/core/service/CommitsService.scala

@@ -2,7 +2,6 @@ package gitbucket.core.service
 
 import gitbucket.core.model.CommitComment
 import gitbucket.core.model.Profile._
-import gitbucket.core.model.Profile.profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.model.Profile.dateColumnType
 

src/main/scala/gitbucket/core/service/HandleCommentService.scala

@@ -3,10 +3,10 @@ package gitbucket.core.service
 import gitbucket.core.controller.Context
 import gitbucket.core.model.Issue
 import gitbucket.core.model.Profile._
+import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.util.ControlUtil._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.Notifier
-import profile.blockingApi._
 
 trait HandleCommentService {
   self: RepositoryService with IssuesService with ActivityService

src/main/scala/gitbucket/core/service/LabelsService.scala

@@ -2,7 +2,6 @@ package gitbucket.core.service
 
 import gitbucket.core.model.Label
 import gitbucket.core.model.Profile._
-import gitbucket.core.model.Profile.profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
 
 trait LabelsService {

src/main/scala/gitbucket/core/service/MilestonesService.scala

@@ -2,7 +2,6 @@ package gitbucket.core.service
 
 import gitbucket.core.model.Milestone
 import gitbucket.core.model.Profile._
-import gitbucket.core.model.Profile.profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.model.Profile.dateColumnType
 

src/main/scala/gitbucket/core/service/ProtectedBranchService.scala

@@ -3,7 +3,6 @@ package gitbucket.core.service
 import gitbucket.core.model.{ProtectedBranch, ProtectedBranchContext, CommitState}
 import gitbucket.core.plugin.ReceiveHook
 import gitbucket.core.model.Profile._
-import gitbucket.core.model.Profile.profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
 
 import org.eclipse.jgit.transport.{ReceivePack, ReceiveCommand}

src/main/scala/gitbucket/core/service/PullRequestService.scala

@@ -2,7 +2,6 @@ package gitbucket.core.service
 
 import gitbucket.core.model.{Issue, PullRequest, CommitStatus, CommitState}
 import gitbucket.core.model.Profile._
-import gitbucket.core.model.Profile.profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
 import difflib.{Delta, DiffUtils}
 import gitbucket.core.model.{Session => _, _}

src/main/scala/gitbucket/core/service/RepositoryCreationService.scala

@@ -1,6 +1,6 @@
 package gitbucket.core.service
 
-import gitbucket.core.model.Profile._
+import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.util.ControlUtil._
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.JGitUtil
@@ -8,7 +8,6 @@ import gitbucket.core.model.Account
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.dircache.DirCache
 import org.eclipse.jgit.lib.{FileMode, Constants}
-import profile.blockingApi._
 
 trait RepositoryCreationService {
   self: AccountService with RepositoryService with LabelsService with WikiService with ActivityService =>

src/main/scala/gitbucket/core/service/RepositorySearchService.scala

@@ -9,8 +9,7 @@ import org.eclipse.jgit.revwalk.RevWalk
 import org.eclipse.jgit.treewalk.TreeWalk
 import org.eclipse.jgit.lib.FileMode
 import org.eclipse.jgit.api.Git
-import gitbucket.core.model.Profile._
+import gitbucket.core.model.Profile.profile.blockingApi._
-import profile.blockingApi._
 
 trait RepositorySearchService { self: IssuesService =>
   import RepositorySearchService._

src/main/scala/gitbucket/core/service/RepositoryService.scala

@@ -5,7 +5,6 @@ import gitbucket.core.util._
 import gitbucket.core.util.ControlUtil._
 import gitbucket.core.model.{Account, Collaborator, Repository, RepositoryOptions, Role}
 import gitbucket.core.model.Profile._
-import gitbucket.core.model.Profile.profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.model.Profile.dateColumnType
 import gitbucket.core.util.JGitUtil.FileInfo

src/main/scala/gitbucket/core/service/SshKeyService.scala

@@ -2,7 +2,6 @@ package gitbucket.core.service
 
 import gitbucket.core.model.SshKey
 import gitbucket.core.model.Profile._
-import gitbucket.core.model.Profile.profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
 
 trait SshKeyService {

src/main/scala/gitbucket/core/service/WebHookService.scala

@@ -5,7 +5,6 @@ import fr.brouillard.oss.security.xhub.XHub.{XHubConverter, XHubDigest}
 import gitbucket.core.api._
 import gitbucket.core.model.{Account, CommitComment, Issue, IssueComment, PullRequest, WebHook, WebHookEvent}
 import gitbucket.core.model.Profile._
-import gitbucket.core.model.Profile.profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
 import org.apache.http.client.utils.URLEncodedUtils
 import gitbucket.core.util.JGitUtil.CommitInfo

src/main/scala/gitbucket/core/servlet/GitAuthenticationFilter.scala

@@ -6,7 +6,7 @@ import gitbucket.core.plugin.{GitRepositoryFilter, GitRepositoryRouting, PluginR
 import gitbucket.core.service.SystemSettingsService.SystemSettings
 import gitbucket.core.service.{RepositoryService, AccountService, SystemSettingsService}
 import gitbucket.core.util.{Keys, Implicits, AuthUtil}
-import gitbucket.core.model.Profile.profile._
+import gitbucket.core.model.Profile.profile.blockingApi._
 import org.slf4j.LoggerFactory
 import Implicits._
 

src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala

@@ -5,7 +5,7 @@ import java.util.Date
 
 import gitbucket.core.api
 import gitbucket.core.model.WebHook
-import gitbucket.core.model.Profile.profile._
+import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.plugin.{GitRepositoryRouting, PluginRegistry}
 import gitbucket.core.service.IssuesService.IssueSearchCondition
 import gitbucket.core.service.WebHookService._

src/main/scala/gitbucket/core/servlet/InitializeListener.scala

@@ -10,7 +10,7 @@ import gitbucket.core.service.{ActivityService, SystemSettingsService}
 import gitbucket.core.util.DatabaseConfig
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.JDBCUtil._
-import gitbucket.core.model.Profile.profile._
+import gitbucket.core.model.Profile.profile.blockingApi._
 import io.github.gitbucket.solidbase.Solidbase
 import io.github.gitbucket.solidbase.manager.JDBCVersionManager
 import javax.servlet.{ServletContextListener, ServletContextEvent}

src/main/scala/gitbucket/core/servlet/TransactionFilter.scala

@@ -8,7 +8,7 @@ import org.scalatra.ScalatraBase
 import org.slf4j.LoggerFactory
 import slick.jdbc.JdbcBackend.{Database => SlickDatabase, Session}
 import gitbucket.core.util.Keys
-import gitbucket.core.model.Profile.profile._
+import gitbucket.core.model.Profile.profile.blockingApi._
 
 /**
  * Controls the transaction with the open session in view pattern.

src/main/scala/gitbucket/core/ssh/GitCommand.scala

@@ -1,15 +1,15 @@
 package gitbucket.core.ssh
 
-import gitbucket.core.model.Session
+import gitbucket.core.model.Profile.profile.blockingApi._
-import gitbucket.core.model.Profile.profile._
 import gitbucket.core.plugin.{GitRepositoryRouting, PluginRegistry}
-import gitbucket.core.service.{RepositoryService, AccountService, SystemSettingsService}
+import gitbucket.core.service.{AccountService, RepositoryService, SystemSettingsService}
-import gitbucket.core.servlet.{Database, CommitLogHook}
+import gitbucket.core.servlet.{CommitLogHook, Database}
-import gitbucket.core.util.{Directory, ControlUtil}
+import gitbucket.core.util.{ControlUtil, Directory}
-import org.apache.sshd.server.{CommandFactory, Environment, ExitCallback, Command, SessionAware}
+import org.apache.sshd.server.{Command, CommandFactory, Environment, ExitCallback, SessionAware}
 import org.apache.sshd.server.session.ServerSession
 import org.slf4j.LoggerFactory
 import java.io.{File, InputStream, OutputStream}
+
 import ControlUtil._
 import org.eclipse.jgit.api.Git
 import Directory._

src/main/scala/gitbucket/core/ssh/PublicKeyAuthenticator.scala

@@ -4,7 +4,7 @@ import java.security.PublicKey
 
 import gitbucket.core.service.SshKeyService
 import gitbucket.core.servlet.Database
-import gitbucket.core.model.Profile.profile._
+import gitbucket.core.model.Profile.profile.blockingApi._
 import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator
 import org.apache.sshd.server.session.ServerSession
 import org.apache.sshd.common.AttributeStore

src/main/scala/gitbucket/core/util/Notifier.scala

@@ -1,7 +1,7 @@
 package gitbucket.core.util
 
 import gitbucket.core.model.{Session, Issue, Account}
-import gitbucket.core.model.Profile.profile._
+import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.service.{RepositoryService, AccountService, IssuesService, SystemSettingsService}
 import gitbucket.core.servlet.Database
 import gitbucket.core.view.Markdown