From a8f53d965a52fe39353ede7f3889a05300c239b3 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Mon, 8 Oct 2018 19:00:43 +0900 Subject: [PATCH 1/4] Update version to 4.30.0-SNAPSHOT --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index efaf07a74..1d63a2931 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ import com.typesafe.sbt.pgp.PgpKeys._ val Organization = "io.github.gitbucket" val Name = "gitbucket" -val GitBucketVersion = "4.29.0" +val GitBucketVersion = "4.30.0-SNAPSHOT" val ScalatraVersion = "2.6.3" val JettyVersion = "9.4.11.v20180605" val JgitVersion = "5.1.1.201809181055-r" From 28567acffae8e800a976d29b64488b22fad78feb Mon Sep 17 00:00:00 2001 From: KOUNOIKE Yuusuke Date: Wed, 10 Oct 2018 11:22:57 +0900 Subject: [PATCH 2/4] add missing ApiXXControllerBase --- .../gitbucket/core/controller/ApiController.scala | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/scala/gitbucket/core/controller/ApiController.scala b/src/main/scala/gitbucket/core/controller/ApiController.scala index 049f59bea..30d1564f0 100644 --- a/src/main/scala/gitbucket/core/controller/ApiController.scala +++ b/src/main/scala/gitbucket/core/controller/ApiController.scala @@ -1,7 +1,7 @@ package gitbucket.core.controller import gitbucket.core.api._ -import gitbucket.core.controller.api.{ApiOrganizationControllerBase, ApiRepositoryControllerBase, ApiUserControllerBase} +import gitbucket.core.controller.api._ import gitbucket.core.service._ import gitbucket.core.util.Implicits._ import gitbucket.core.util._ @@ -9,8 +9,17 @@ import gitbucket.core.plugin.PluginRegistry class ApiController extends ApiControllerBase + with ApiGitReferenceControllerBase + with ApiIssueCommentControllerBase + with ApiIssueControllerBase + with ApiIssueLabelControllerBase with ApiOrganizationControllerBase + with ApiPullRequestControllerBase + with ApiRepositoryBranchControllerBase + with ApiRepositoryCollaboratorControllerBase + with ApiRepositoryCommitControllerBase with ApiRepositoryControllerBase + with ApiRepositoryStatusControllerBase with ApiUserControllerBase with RepositoryService with AccountService From ed17f0a9121f3cc7c9f69f1c2d68a6e6505abd26 Mon Sep 17 00:00:00 2001 From: Uli Heller Date: Thu, 11 Oct 2018 06:29:52 +0200 Subject: [PATCH 3/4] tika: Upgraded to 1.19.1 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 1d63a2931..58285b55d 100644 --- a/build.sbt +++ b/build.sbt @@ -44,7 +44,7 @@ libraryDependencies ++= Seq( "org.apache.commons" % "commons-email" % "1.5", "org.apache.httpcomponents" % "httpclient" % "4.5.6", "org.apache.sshd" % "apache-sshd" % "2.1.0" exclude ("org.slf4j", "slf4j-jdk14"), - "org.apache.tika" % "tika-core" % "1.19", + "org.apache.tika" % "tika-core" % "1.19.1", "com.github.takezoe" %% "blocking-slick-32" % "0.0.10", "com.novell.ldap" % "jldap" % "2009-10-07", "com.h2database" % "h2" % "1.4.196", From a1b78a8f2a6ab7368ee58ea8328db6e523eb548b Mon Sep 17 00:00:00 2001 From: Uli Heller Date: Thu, 11 Oct 2018 06:45:19 +0200 Subject: [PATCH 4/4] jgit: Upgraded to 5.1.2 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 1d63a2931..917685b24 100644 --- a/build.sbt +++ b/build.sbt @@ -6,7 +6,7 @@ val Name = "gitbucket" val GitBucketVersion = "4.30.0-SNAPSHOT" val ScalatraVersion = "2.6.3" val JettyVersion = "9.4.11.v20180605" -val JgitVersion = "5.1.1.201809181055-r" +val JgitVersion = "5.1.2.201810061102-r" lazy val root = (project in file(".")) .enablePlugins(SbtTwirl, ScalatraPlugin)