Release GitBucket 4.36.1

* Update sbt-dependency-graph plugin installation

According with https://github.com/sbt/sbt-dependency-graph#usage-instructions, for sbt >= 1.4.x we should install the plugin with `addDependencyTreePlugin` instead of `addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.10.0-RC1")`

* Fix scalafmt

CHANGELOG.md

@@ -1,9 +1,12 @@
 # Changelog
 All changes to the project will be documented in this file.
 
+### 4.36.1 - 22 Jul 2021
+- Bump gitbucket-gist-plugin to 4.21.0
+
 ### 4.36.0 - 17 Jul 2021
 - Tag selector in the repository viewer
-- Link iusses/pull requests of other repositories
+- Link issues/pull requests of other repositories
 - Files and lines can be linked in the diff view
 - Option to disable XSS protection
 

README.md

@@ -63,9 +63,12 @@ Support
 
 What's New in 4.36.x
 -------------
+### 4.36.1 - 22 Jul 2021
+- Bump gitbucket-gist-plugin to 4.21.0
+
 ### 4.36.0 - 17 Jul 2021
 - Tag selector in the repository viewer
-- Link iusses/pull requests of other repositories
+- Link issues/pull requests of other repositories
 - Files and lines can be linked in the diff view
 - Option to disable XSS protection
 

build.sbt

@@ -3,7 +3,7 @@ import com.jsuereth.sbtpgp.PgpKeys._
 
 val Organization = "io.github.gitbucket"
 val Name = "gitbucket"
-val GitBucketVersion = "4.36.0"
+val GitBucketVersion = "4.36.1"
 val ScalatraVersion = "2.7.1"
 val JettyVersion = "9.4.43.v20210629"
 val JgitVersion = "5.12.0.202106070339-r"
@@ -43,14 +43,14 @@ libraryDependencies ++= Seq(
   "commons-net"                     % "commons-net"                  % "3.8.0",
   "org.apache.httpcomponents"       % "httpclient"                   % "4.5.13",
   "org.apache.sshd"                 % "apache-sshd"                  % "2.1.0" exclude ("org.slf4j", "slf4j-jdk14") exclude ("org.apache.sshd", "sshd-mina") exclude ("org.apache.sshd", "sshd-netty"),
-  "org.apache.tika"                 % "tika-core"                    % "1.27",
+  "org.apache.tika"                 % "tika-core"                    % "2.0.0",
   "com.github.takezoe"              %% "blocking-slick-32"           % "0.0.12" cross CrossVersion.for3Use2_13,
   "com.novell.ldap"                 % "jldap"                        % "2009-10-07",
   "com.h2database"                  % "h2"                           % "1.4.199",
   "org.mariadb.jdbc"                % "mariadb-java-client"          % "2.7.3",
   "org.postgresql"                  % "postgresql"                   % "42.2.23",
-  "ch.qos.logback"                  % "logback-classic"              % "1.2.3",
-  "com.zaxxer"                      % "HikariCP"                     % "4.0.3",
+  "ch.qos.logback"                  % "logback-classic"              % "1.2.4",
+  "com.zaxxer"                      % "HikariCP"                     % "4.0.3" exclude ("org.slf4j", "slf4j-api"),
   "com.typesafe"                    % "config"                       % "1.4.1",
   "fr.brouillard.oss.security.xhub" % "xhub4j-core"                  % "1.1.0",
   "io.github.java-diff-utils"       % "java-diff-utils"              % "4.10",
@@ -64,8 +64,8 @@ libraryDependencies ++= Seq(
   "org.scalatra"                    %% "scalatra-scalatest"          % ScalatraVersion % "test" cross CrossVersion.for3Use2_13,
   "org.mockito"                     % "mockito-core"                 % "3.11.2" % "test",
   "com.dimafeng"                    %% "testcontainers-scala"        % "0.39.5" % "test",
-  "org.testcontainers"              % "mysql"                        % "1.15.3" % "test",
-  "org.testcontainers"              % "postgresql"                   % "1.15.3" % "test",
+  "org.testcontainers"              % "mysql"                        % "1.16.0" % "test",
+  "org.testcontainers"              % "postgresql"                   % "1.16.0" % "test",
   "net.i2p.crypto"                  % "eddsa"                        % "0.3.0",
   "is.tagomor.woothee"              % "woothee-java"                 % "1.11.0",
   "org.ec4j.core"                   % "ec4j-core"                    % "0.3.0",

project/plugins.sbt

@@ -1,10 +1,11 @@
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")
 
-addSbtPlugin("org.scalameta"    % "sbt-scalafmt"         % "2.4.3")
-addSbtPlugin("com.typesafe.sbt" % "sbt-twirl"            % "1.5.1")
-addSbtPlugin("com.eed3si9n"     % "sbt-assembly"         % "1.0.0")
-addSbtPlugin("org.scalatra.sbt" % "sbt-scalatra"         % "1.0.4")
-addSbtPlugin("com.github.sbt"   % "sbt-pgp"              % "2.1.2")
-addSbtPlugin("com.typesafe.sbt" % "sbt-license-report"   % "1.2.0")
-addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2")
-addSbtPlugin("org.scoverage"    % "sbt-scoverage"        % "1.8.2")
+addSbtPlugin("org.scalameta"    % "sbt-scalafmt"       % "2.4.3")
+addSbtPlugin("com.typesafe.sbt" % "sbt-twirl"          % "1.5.1")
+addSbtPlugin("com.eed3si9n"     % "sbt-assembly"       % "1.0.0")
+addSbtPlugin("org.scalatra.sbt" % "sbt-scalatra"       % "1.0.4")
+addSbtPlugin("com.github.sbt"   % "sbt-pgp"            % "2.1.2")
+addSbtPlugin("com.typesafe.sbt" % "sbt-license-report" % "1.2.0")
+addSbtPlugin("org.scoverage"    % "sbt-scoverage"      % "1.8.2")
+
+addDependencyTreePlugin

src/main/resources/bundle-plugins.txt

@@ -1,4 +1,4 @@
 notifications:1.10.0
-gist:4.20.0
+gist:4.21.0
 emoji:4.6.0
 pages:1.9.0

src/main/scala/gitbucket/core/GitBucketCoreModule.scala

@@ -118,5 +118,6 @@ object GitBucketCoreModule
       new Version("4.35.1"),
       new Version("4.35.2"),
       new Version("4.35.3"),
-      new Version("4.36.0", new LiquibaseMigration("update/gitbucket-core_4.36.xml"))
+      new Version("4.36.0", new LiquibaseMigration("update/gitbucket-core_4.36.xml")),
+      new Version("4.36.1")
     )

src/main/scala/gitbucket/core/controller/PreProcessController.scala

@@ -32,6 +32,7 @@ trait PreProcessControllerBase extends ControllerBase {
   get(!context.settings.allowAnonymousAccess, context.loginAccount.isEmpty) {
     if (!context.currentPath.startsWith("/assets") && !context.currentPath.startsWith("/signin") &&
         !context.currentPath.startsWith("/register") && !context.currentPath.endsWith("/info/refs") &&
+        !context.currentPath.startsWith("/plugin-assets") &&
         !PluginRegistry().getAnonymousAccessiblePaths().exists { path =>
           context.currentPath.startsWith(path)
         }) {